Commit Graph

668 Commits

Author SHA1 Message Date
taiyang-li
1114c54899 merge master and fix conflict 2022-03-23 11:03:25 +08:00
Alexander Tokmakov
3c762f566d Merge branch 'master' into mvcc_prototype 2022-03-21 20:16:29 +01:00
Nikolai Kochetov
5e239762c6
Merge pull request #35334 from amosbird/fixpartitionpruneroverflow
Fix incorrect partition pruning when constant in predicate has no supertype of related key columns
2022-03-21 17:05:19 +01:00
Alexander Tokmakov
94f616b48e Merge branch 'master' into merging_30325 2022-03-21 13:23:45 +01:00
Amos Bird
623ae212e4
Use string view instead of C-str 2022-03-21 19:54:30 +08:00
Amos Bird
c379b9e0cf
revert client nit fix and add comment 2022-03-21 19:37:54 +08:00
Amos Bird
14963f1776
client nit fix 2022-03-18 17:47:03 +08:00
mergify[bot]
fa02398f8f
Merge branch 'master' into enable-testmode-by-default 2022-03-18 09:39:49 +00:00
Alexander Tokmakov
07d952b728 use snapshots for semistructured data, durability fixes 2022-03-17 18:26:18 +01:00
mergify[bot]
5295dd0ef2
Merge branch 'master' into stress-test 2022-03-17 11:10:37 +00:00
kssenii
d136916508 Remove testmode option 2022-03-17 10:54:37 +01:00
Anton Popov
0ba78c3c3a Merge remote-tracking branch 'upstream/master' into HEAD 2022-03-16 15:28:09 +00:00
Vladimir C
e022245a33
Merge pull request #35193 from vdimir/issue-34776 2022-03-15 19:56:09 +01:00
Vladimir C
02414f1e88
Merge branch 'master' into issue-34776 2022-03-15 14:24:51 +01:00
mergify[bot]
9cdd6ec7ab
Merge branch 'master' into test-mode-for-local 2022-03-15 08:28:40 +00:00
Maksim Kita
07b0845110 Fix clang-tidy warnings in Backups, Client, Columns folders 2022-03-14 18:17:35 +00:00
Anton Popov
36ec379aeb Merge remote-tracking branch 'upstream/master' into HEAD 2022-03-14 16:28:35 +00:00
vdimir
db46c2ada8
Fix reading port from config 2022-03-14 11:58:47 +00:00
kssenii
199188be08 Support test mode for clickhouse-local 2022-03-14 12:02:06 +01:00
mergify[bot]
78c8029aeb
Merge branch 'master' into stress-test 2022-03-09 16:22:45 +00:00
Azat Khuzhin
a871036361
Fix parallel_reading_from_replicas with clickhouse-bechmark (#34751)
* Use INITIAL_QUERY for clickhouse-benchmark

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>

* Fix parallel_reading_from_replicas with clickhouse-bechmark

Before it produces the following error:

    $ clickhouse-benchmark --stacktrace -i1 --query "select * from remote('127.1', default.data_mt) limit 10" --allow_experimental_parallel_reading_from_replicas=1 --max_parallel_replicas=3
    Loaded 1 queries.
    Logical error: 'Coordinator for parallel reading from replicas is not initialized'.
    Aborted (core dumped)

Since it uses the same code, i.e RemoteQueryExecutor ->
MultiplexedConnections, which enables coordinator if it was requested
from settings, but it should be done only for non-initial queries, i.e.
when server send connection to another server.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>

* Fix 02226_parallel_reading_from_replicas_benchmark for older shellcheck

By shellcheck 0.8 does not complains, while on CI shellcheck 0.7.0 and
it does complains [1]:

    In 02226_parallel_reading_from_replicas_benchmark.sh line 17:
        --allow_experimental_parallel_reading_from_replicas=1
        ^-- SC2191: The = here is literal. To assign by index, use ( [index]=value ) with no spaces. To keep as literal, quote it.

    Did you mean:
        "--allow_experimental_parallel_reading_from_replicas=1"

  [1]: https://s3.amazonaws.com/clickhouse-test-reports/34751/d883af711822faf294c876b017cbf745b1cda1b3/style_check__actions_/shellcheck_output.txt

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-03-08 16:42:29 +01:00
taiyang-li
2283513fc8 merge master and solve conflict 2022-03-08 11:29:00 +08:00
Anton Popov
0bc57da238 Merge remote-tracking branch 'upstream/master' into HEAD 2022-03-07 14:46:08 +00:00
Kseniia Sumarokova
cdb9a05229
Merge pull request #34605 from bigo-sg/add_metric_for_local
Add cpu/mem metric for clickhouse-local
2022-03-07 11:40:11 +01:00
taiyang-li
1b9987ceb1 fix mistake in check-style 2022-03-05 14:22:56 +08:00
Kruglov Pavel
dbba752398
Merge branch 'master' into stress-test 2022-03-04 18:33:37 +03:00
Anton Popov
df3b07fe7c Merge remote-tracking branch 'upstream/master' into HEAD 2022-03-03 22:25:28 +00:00
mergify[bot]
c90d24e10b
Merge branch 'master' into random-settings 2022-03-03 13:07:12 +00:00
Maksim Kita
7d90afb3b0
Merge pull request #34988 from azat/safe-exit
Fix signal-unsafe TSan report in client
2022-03-03 09:21:26 +01:00
Azat Khuzhin
a0e590ae6c Fix signal-unsafe TSan report in client
CI founds [1]:

    WARNING: ThreadSanitizer: signal-unsafe call inside of a signal (pid=2975)
        0 malloc  (clickhouse+0xab36d8d)
        1 _dl_exception_create_format  (ld-linux-x86-64.so.2+0x18ea8)
        2 DB::interruptSignalHandler(int) obj-x86_64-linux-gnu/../src/Client/ClientBase.cpp:236:9 (clickhouse+0x1a1d603e)
        3 __tsan::CallUserSignalHandler(__tsan::ThreadState*, bool, bool, bool, int, __sanitizer::__sanitizer_siginfo*, void*) crtstuff.c (clickhouse+0xab3ee5f)
        4 unsigned long std::__1::__cxx_atomic_load(std::__1::__cxx_atomic_base_impl const*, std::__1::memory_order) obj-x86_64-linux-gnu/../contrib/libcxx/include/atomic:1006:12 (clickhouse+0x1da6c41d)
        5 std::__1::__atomic_base::load(std::__1::memory_order) const obj-x86_64-linux-gnu/../contrib/libcxx/include/atomic:1615:17 (clickhouse+0x1da6c41d)
        6 cctz::TimeZoneInfo::MakeTime(cctz::detail::civil_time const&) const obj-x86_64-linux-gnu/../contrib/cctz/src/time_zone_info.cc:844:47 (clickhouse+0x1da6c41d)
        7 cctz::time_zone::Impl::MakeTime(cctz::detail::civil_time const&) const obj-x86_64-linux-gnu/../contrib/cctz/src/time_zone_impl.h:57:19 (clickhouse+0x1da64777)
        8 cctz::time_zone::lookup(cctz::detail::civil_time const&) const obj-x86_64-linux-gnu/../contrib/cctz/src/time_zone_lookup.cc:72:27 (clickhouse+0x1da64777)
        9 DateLUTImpl::DateLUTImpl(std::__1::basic_string, std::__1::allocator > const&) obj-x86_64-linux-gnu/../src/Common/DateLUTImpl.cpp:70:63 (clickhouse+0xac8910b)
        10 DateLUT::getImplementation(std::__1::basic_string, std::__1::allocator > const&) const obj-x86_64-linux-gnu/../src/Common/DateLUT.cpp:155:55 (clickhouse+0xac87404)
        11 DateLUT::DateLUT() obj-x86_64-linux-gnu/../src/Common/DateLUT.cpp:145:25 (clickhouse+0xac8697f)
        12 DateLUT::getInstance() obj-x86_64-linux-gnu/../src/Common/DateLUT.cpp:162:20 (clickhouse+0xac87530)
        13 DateLUT::instance(std::__1::basic_string, std::__1::allocator > const&) obj-x86_64-linux-gnu/../src/Common/DateLUT.h:29:33 (clickhouse+0x188481f9)
        14 TimezoneMixin::TimezoneMixin(std::__1::basic_string, std::__1::allocator > const&) obj-x86_64-linux-gnu/../src/DataTypes/TimezoneMixin.h:18:21 (clickhouse+0x188481f9)
        15 DB::DataTypeDateTime::DataTypeDateTime(std::__1::basic_string, std::__1::allocator > const&) obj-x86_64-linux-gnu/../src/DataTypes/DataTypeDateTime.cpp:11:7 (clickhouse+0x18847e55)
        16 DB::(anonymous namespace)::FunctionEmptyArray::getNameImpl() emptyArray.cpp (clickhouse+0x1602abb1)
        17 DB::registerFunctionsEmptyArray(DB::FunctionFactory&)  (clickhouse+0x16023b6f)
        18 DB::registerFunctionsArray(DB::FunctionFactory&)  (clickhouse+0x15de7b99)
        19 DB::registerFunctions()  (clickhouse+0xe4e7bc6)
        20 DB::Client::main(std::__1::vector, std::__1::allocator >, std::__1::allocator, std::__1::allocator > > > const&) obj-x86_64-linux-gnu/../programs/client/Client.cpp:402:5 (clickhouse+0xacb2649)
        21 Poco::Util::Application::run() obj-x86_64-linux-gnu/../contrib/poco/Util/src/Application.cpp:334:8 (clickhouse+0x1d96868a)
        22 mainEntryClickHouseClient(int, char**) obj-x86_64-linux-gnu/../programs/client/Client.cpp:1237:23 (clickhouse+0xacbdd7c)
        23 main obj-x86_64-linux-gnu/../programs/main.cpp:378:12 (clickhouse+0xabae77a)

  [1]: https://s3.amazonaws.com/clickhouse-test-reports/34924/66cbb468eb6990b74ef4d08beefbe48d32bf4bd5/stateless_tests__thread__actions__[1/3].html

Fixes: #34923
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-03-02 22:17:17 +03:00
Maksim Kita
b1a956c5f1 clang-tidy check performance-move-const-arg fix 2022-03-02 18:15:27 +00:00
Kruglov Pavel
3b92b9037f
Merge branch 'master' into random-settings 2022-03-02 21:09:48 +03:00
avogar
d25d83580a Fix tests 2022-03-02 16:33:21 +00:00
Anton Popov
c1fdcf7a64 Merge remote-tracking branch 'upstream/master' into HEAD 2022-03-01 20:21:39 +03:00
taiyang-li
7f69507c95 finish dev 2022-03-01 17:22:12 +08:00
taiyang-li
f83132bad2 finish dev 2022-03-01 15:54:23 +08:00
taiyang-li
b31440c77a Merge branch 'master' into add_metric_for_local 2022-03-01 12:29:36 +08:00
mergify[bot]
8014cdf9d3
Merge branch 'master' into random-settings 2022-02-28 14:06:22 +00:00
Azat Khuzhin
f66ad2ee48 Stop processing multiqueries in clickhouse-client/local on SIGINT
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-28 12:19:13 +03:00
Azat Khuzhin
895c40686c Tiny cleanup of ClientBase
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-28 12:19:13 +03:00
Azat Khuzhin
067df156eb Use proper exit value on exit by signal (like in glibc)
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-28 12:19:13 +03:00
Anton Popov
fcdebea925 Merge remote-tracking branch 'upstream/master' into HEAD 2022-02-25 13:41:30 +03:00
Azat Khuzhin
9b753c84f0 Print only total profile events for --profile-events-delay-ms=-1
There was serveral issues:
1) there can be events for multiple threads in one block
2) lack of filter for thread_id = 0
3) thread_id was included into comparator

Fixes: #34719
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-19 13:49:41 +03:00
Kruglov Pavel
e77319bf01
Merge branch 'master' into stress-test 2022-02-17 20:28:46 +03:00
avogar
1e797c1a8f Fix some tests 2022-02-16 15:10:02 +00:00
Kruglov Pavel
adf58ea1ce
Merge pull request #34490 from Avogar/fix-client
Refactor client fault tolerant connection
2022-02-16 12:39:46 +03:00
Nikita Mikhaylov
e1b0c715fa Done 2022-02-15 15:39:59 +00:00
taiyang-li
e6b29167da fix style 2022-02-15 20:26:53 +08:00
taiyang-li
24bd47e556 finish dev 2022-02-15 20:11:13 +08:00
taiyang-li
b4440131d0 add metrics for clickhouse-local 2022-02-15 16:25:07 +08:00
Kruglov Pavel
a4f5610764
Merge pull request #34476 from CurtizJ/avoid-settings-copy
Avoid unnecessary copying of `Settings`
2022-02-10 14:13:46 +03:00
avogar
372e1f2013 Fix test 2022-02-10 14:06:32 +03:00
avogar
75c56163a0 Refactor client fault tolerant connection 2022-02-10 12:43:08 +03:00
Anton Popov
298838f891 avoid unnecessary copying of Settings 2022-02-10 12:13:51 +03:00
Anton Popov
18940b8637 Merge remote-tracking branch 'upstream/master' into HEAD 2022-02-09 23:38:38 +03:00
DF5HSE
c08bc7ad65 Merge branch 'master' of github.com:ClickHouse/ClickHouse into client-fault-tolerant-connection 2022-02-08 11:37:31 +03:00
DF5HSE
c1df291b18 Fix error with IPv6 in host param 2022-02-08 02:03:41 +03:00
DF5HSE
87933e44d6 Fix codestyle 2022-02-08 02:03:40 +03:00
DF5HSE
b035ad7843 Fix error with IPv6 in host param and impove HostPort reading from input stream 2022-02-08 02:03:39 +03:00
DF5HSE
3cb433762b Fix errors in build check 2022-02-08 02:03:39 +03:00
DF5HSE
18a777cc8b Add function which gets port from configuration 2022-02-08 02:03:37 +03:00
DF5HSE
69e535fcb2 Merge branch 'master' of github.com:ClickHouse/ClickHouse into client-fault-tolerant-connection 2022-02-08 02:03:36 +03:00
DF5HSE
e780c1292d Add tests, remove saving host in config 2022-02-08 02:03:35 +03:00
DF5HSE
03b4945704 Fix codestyle 2022-02-08 02:03:35 +03:00
kssenii
e41a895ebb Fix 2022-02-06 16:11:18 +01:00
Kseniia Sumarokova
4dee6488f9
Merge pull request #34265 from kssenii/add-query-id-for-client-queries-file
print query id when using `--interactive` with `--queries-file` in client/local
2022-02-05 17:23:33 +01:00
alexey-milovidov
768c71c1ac
Update ClientBase.cpp 2022-02-03 05:13:48 +03:00
Anton Popov
5bb1b3ce77 support async inserts in clickhouse-client for queries with inlined data 2022-02-02 20:59:37 +03:00
kssenii
eae0bc7c04 add query id for delayed interactive 2022-02-02 18:20:59 +03:00
Sergei Trifonov
68bc456830
Merge pull request #34223 from azat/bump-fmt
Bump fmtlib from 7.0.0 to 8.1.1
2022-02-02 00:03:25 +03:00
Azat Khuzhin
bedf208cbd Use fmt::runtime() for LOG_* for non constexpr
Here is oneliner:

    $ gg 'LOG_\(DEBUG\|TRACE\|INFO\|TEST\|WARNING\|ERROR\|FATAL\)([^,]*, [a-zA-Z]' -- :*.cpp :*.h | cut -d: -f1 | sort -u | xargs -r sed -E -i 's#(LOG_[A-Z]*)\(([^,]*), ([A-Za-z][^,)]*)#\1(\2, fmt::runtime(\3)#'

Note, that I tried to do this with coccinelle (tool for semantic
patchin), but it cannot parse C++:

    $ cat fmt.cocci
    @@
    expression log;
    expression var;
    @@

    -LOG_DEBUG(log, var)
    +LOG_DEBUG(log, fmt::runtime(var))

I've also tried to use some macros/templates magic to do this implicitly
in logger_useful.h, but I failed to do so, and apparently it is not
possible for now.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>

v2: manual fixes
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
2022-02-01 14:30:03 +03:00
Amos Bird
bb34435928
Better code 2022-01-30 19:48:35 +08:00
Amos Bird
54517753d7
Combining our lexer with replxx 2022-01-30 19:48:33 +08:00
Anton Popov
78b9f15abb Merge remote-tracking branch 'upstream/master' into HEAD 2022-01-30 03:24:37 +03:00
Kruglov Pavel
b54bf18b27
Merge branch 'master' into stress-test 2022-01-25 14:35:42 +03:00
Azat Khuzhin
1acd644040 Add inplace merge for new completion words
This will allow:
- use addWords() everywhere
- remove that optimization for empty words case (initial load)
- and now we remove duplicates according to comparator

v2: replace parameter pack in addWords() with explicit Compare for both
cases (just pass default)
2022-01-24 22:59:18 +03:00
Anton Popov
e8ce091e68 Merge remote-tracking branch 'upstream/master' into HEAD 2022-01-21 20:11:18 +03:00
Kruglov Pavel
175788ecf9
Merge pull request #33790 from Avogar/fix-input
Fix bug in client that led to 'Connection reset by peer' in server
2022-01-20 14:09:13 +03:00
Azat Khuzhin
3e58094bcb Fix build w/o replxx 2022-01-20 10:02:02 +03:00
DF5HSE
b46af3e0c4 Add list of '<host>:[<port>]' reading in --host param 2022-01-20 00:36:18 +03:00
DF5HSE
f6d50f6fd3 Add list of hosts reading 2022-01-20 00:15:11 +03:00
avogar
6092ed48bd Fix bug in client that led to 'Connection reset by peer' in server 2022-01-19 19:04:57 +03:00
Azat Khuzhin
f12e4b6ef7 Rewrite suggestions to make it more cleaner
- use plain mutex over atomic
- use addWords() for initial suggestion filling
- return vector<> from getCompletions() over iterator, to avoid possible
  questions (even though it was safe, since addWords() could not be
  called in parallel with getCompletions() before)
2022-01-18 21:03:51 +03:00
Kruglov Pavel
d2e9f37bee
Merge branch 'master' into format-by-extention 2022-01-14 18:36:23 +03:00
avogar
817a314263 Fix tests and style 2022-01-14 17:46:24 +03:00
tavplubix
8c9a369588
Merge pull request #33535 from kssenii/fix-local-client-exception
Fix clickhouse local interactive exception case
2022-01-12 13:17:05 +03:00
kssenii
211f1dd482 Fix 2022-01-12 00:28:53 +03:00
zhongyuankai
99279c1443 INTO OUTFILE / FROM INFILE: autodetect FORMAT by file extension 2022-01-11 21:26:14 +08:00
zhongyuankai
878e44eb97 auto format by file extension 2022-01-08 21:47:14 +08:00
Azat Khuzhin
0685fd9985 clickhouse-local: track memory under --max_memory_usage_in_client option 2021-12-31 11:06:15 +03:00
Alexey Milovidov
c1297d2431 Compatibility 2021-12-29 19:57:40 +03:00
Alexey Milovidov
e8e19b8b0d Always display resource usage in client 2021-12-29 01:20:34 +03:00
Azat Khuzhin
36c4fc054c Client interactive suggest (extract info from CREATE queries)
This will parse CREATE queries and add the following things to
completion list for clickhouse-client/clickhouse-local:
- table
- database
- columns
2021-12-26 19:10:25 +03:00
Alexey Milovidov
29d28c531f Move code around to avoid dlsym on Musl 2021-12-24 12:25:27 +03:00
Kruglov Pavel
ffb6c5b37b
Merge branch 'master' into stress-test 2021-12-23 20:14:15 +03:00
kssenii
8cf52918b9 clickhouse local send profile info 2021-12-23 12:37:29 +03:00
Nikolay Degterinsky
6757afa052
Merge pull request #32843 from nkolotov/fix_echo_option_not_used_in_batch_mode
Fixed --echo option is not used by clickhouse-client in batch mode with single query
2021-12-23 11:37:02 +03:00
Kseniia Sumarokova
2ac7897470
Merge pull request #32841 from lingtaolf/feature/add-clickhouse-client-hints
Add clickhouse client hints
2021-12-20 23:48:50 +03:00
Kseniia Sumarokova
a5f28e51e5
Try fix style check 2021-12-20 18:09:20 +03:00
凌涛
0efc01be05 add test 2021-12-20 13:53:08 +08:00
Azat Khuzhin
1d25ec3e82 Merge ProfileEvents in case they were not printed
That way with --profile-events-delay-ms=-1 you will always get totals.

Plus, this will fix periodic failures, that can be reproduced by
limitting CPU (5% is enough in my setup), i.e.:

    $ systemd-run --collect --unit ch -p CPUQuota=5% --user clickhouse-server
    $ while clickhouse-client --print-profile-events --profile-events-delay-ms=-1 -q 'select * from numbers (1e5) format Null' |& tee /dev/stderr | fgrep 'SelectedRows: 131010 (increment)'; do :; done

And as a bonus it will make 02050_client_profile_events deterministic.
2021-12-19 23:43:05 +03:00
Anton Popov
99ebabd822 Merge remote-tracking branch 'upstream/master' into HEAD 2021-12-17 19:02:29 +03:00
凌涛
bf1098484e modify code style 2021-12-16 20:31:06 +08:00
凌涛
ad34217873 Add hints for clickhouse client options 2021-12-16 20:19:00 +08:00
N. Kolotov
adf5fcdd0a Fixed --echo option is not used by clickhouse-client in batch mode with single query. 2021-12-16 13:10:49 +03:00
Azat Khuzhin
510eab25a1 Add timeout into "Timeout exceeded while reading from" message 2021-12-14 10:18:57 +03:00
Azat Khuzhin
eb9968babf Add timeout into "Read timeout while draining from" message 2021-12-14 10:18:57 +03:00
Azat Khuzhin
4e4837758a Remove readline support
- it was not nested for a long time
- replxx is an upstream way for completion
2021-12-11 11:29:59 +03:00
Azat Khuzhin
fa6090f588 Fix processing initial table (--table/stdin) in clickhouse-local
This patch will:
- fix the issue when table had been tried to create multiple times for
  --queries-files
- create these table for --interactive mode (before it works only if you
  had some queries already, i.e. when it run interactive after
  non-interactive)

This will also make ClientBase interface a little bit cleaner, by
removing one abstract method getQueryTextPrefix()
2021-12-10 22:08:03 +03:00
Nikita Mikhaylov
dbf5091016
Parallel reading from replicas (#29279) 2021-12-09 13:39:28 +03:00
alexey-milovidov
50c23a9fd6
Merge pull request #31123 from amosbird/repl-improvement
Better clickhouse-client multiline input
2021-12-06 12:22:13 +03:00
Anton Popov
6f4d9a53b2 Merge remote-tracking branch 'origin/sparse-serialization' into HEAD 2021-12-01 15:54:33 +03:00
mergify[bot]
b4f43c59a2
Merge branch 'master' into stress-test 2021-12-01 10:12:22 +00:00
alexey-milovidov
96ec92c7cd
Merge pull request #31155 from ClickHouse/incremental-profile-events
Send incremental profile events to client
2021-12-01 04:04:41 +03:00
mergify[bot]
e6f5792ba3
Merge branch 'master' into stress-test 2021-11-29 09:01:33 +00:00
Raúl Marín
f0ee0724ac Reduce dependencies on ASTSelectQuery.h
243 -> 152
2021-11-26 18:35:24 +01:00
mergify[bot]
ce0c112586
Merge branch 'master' into stress-test 2021-11-25 11:09:26 +00:00
Anton Popov
ccd78e3838 Merge remote-tracking branch 'upstream/master' into HEAD 2021-11-22 17:19:35 +03:00
Vitaly Baranov
6634fcbac7 Rename Quota::ResourceType -> QuotaType and move it to Access/Common. 2021-11-19 00:14:23 +03:00
Kruglov Pavel
f27fcf8372
Merge pull request #31004 from Avogar/output-formats
Small refactoring in formats
2021-11-17 20:44:46 +03:00
Amos Bird
93294734d3
Better clickhouse-client multiline input 2021-11-17 22:11:30 +08:00
Kseniia Sumarokova
d1374481df
Merge pull request #31457 from azat/local-pager
Add --pager support for clickhouse-local
2021-11-17 09:29:56 +03:00
Azat Khuzhin
bbbbd261b8 Add --pager support for clickhouse-local 2021-11-16 22:25:32 +03:00
mergify[bot]
923874060a
Merge branch 'master' into stress-test 2021-11-16 16:42:50 +00:00
Nikolay Degterinsky
ba50e8387d Merge branch 'master' into query_parameters 2021-11-15 19:55:54 +00:00
Nikolay Degterinsky
5d07387987 Fix INFILE tests 2021-11-15 19:55:27 +00:00
Kseniia Sumarokova
846fbd059b
Merge pull request #31403 from kssenii/fix-client-output
Fix client
2021-11-14 15:01:30 +03:00
kssenii
ad1b7c83cd Fix 2021-11-14 07:19:59 +00:00
alexey-milovidov
e323b83f6a
Merge pull request #30876 from pmed/backslash_letter_interactive_input
add aliases for `\<letter>` interactive client commands
2021-11-14 01:43:13 +03:00
Nikolai Kochetov
6623c609cf
Merge pull request #19587 from ClickHouse/refactor-pipeline-executor
Refactor pipeline executor
2021-11-12 11:49:05 +03:00
Kseniia Sumarokova
2313981fd7
Merge pull request #31260 from azat/external-cleanup
Cleanup extern ProfileEvents/CurrentMetrics and add a style check
2021-11-12 00:02:57 +03:00
avogar
e5661b9b62 Minor change 2021-11-11 21:09:21 +03:00
mergify[bot]
58c5981cab
Merge branch 'master' into refactor-pipeline-executor 2021-11-11 16:16:52 +00:00
Nikolay Degterinsky
7b5954b736 Merge branch 'master' into query_parameters 2021-11-11 11:43:00 +00:00
Azat Khuzhin
baf14444e6 Cleanup ProfileEvents and CurrentMetrics 2021-11-10 21:15:27 +03:00
kssenii
6bc7fb1edf Fixes 2021-11-10 09:33:48 +00:00
Anton Popov
a20922b2d3 Merge remote-tracking branch 'origin/sparse-serialization' into HEAD 2021-11-09 15:36:25 +03:00
kssenii
bfde7fd36c Better 2021-11-09 12:06:43 +00:00
mergify[bot]
f55e1439cb
Merge branch 'master' into output-formats 2021-11-08 15:33:45 +00:00
Dmitry Novik
a093395b9b Process incremental profile events on client 2021-11-08 16:38:31 +03:00
kssenii
dead99011b Merge branch 'master' of github.com:ClickHouse/ClickHouse into intersect-except-fix 2021-11-08 16:15:33 +03:00
Kseniia Sumarokova
908d78febe
Merge pull request #30851 from kssenii/clickhouse-local-improve
Allow delayed interactive mode
2021-11-08 10:07:29 +03:00
tavplubix
94a66f724e
Merge pull request #30135 from FArthur-cmd/add_parallel_reading_from_infile
Add parallel file reading `FROM INFILE` in client
2021-11-06 15:54:27 +03:00
kssenii
26c4affc18 Fixes 2021-11-04 11:00:35 +00:00
avogar
2dd4393ca1 Small refactoring in formats 2021-11-03 20:07:05 +03:00
mergify[bot]
8ef9e61e36
Merge branch 'master' into stress-test 2021-11-03 08:28:43 +00:00
kssenii
feb3d8bc75 Merge branch 'master' of github.com:ClickHouse/ClickHouse into clickhouse-local-improve 2021-11-02 20:01:15 +00:00
Kseniia Sumarokova
351c7bc8d6
Merge pull request #30881 from kssenii/fix-local-verbose
clickhouse-local interactive fix --verbose and allow logging into file
2021-11-01 23:08:49 +03:00
kssenii
35349056b8 Fix 2021-11-01 16:33:19 +03:00
zhangxiao871
45c12f9b2a merge from master 2021-11-01 18:32:56 +08:00
alexey-milovidov
04f5c4bd9a
Merge pull request #30938 from kssenii/fix-local-file-progress
Fix file progress for clickhouse-local
2021-11-01 12:39:12 +03:00
kssenii
d7dab834ec Fix file progress for local 2021-11-01 00:33:03 +03:00
Alexey Milovidov
993f3faefd Miscellaneous 2021-10-31 18:11:46 +03:00
Pavel Medvedev
7b50ab7136 skip spaces before and after \<letter> alias
... for proper single letter like `\l`, `\d` handling.

Using `std::search()` for alias substring search instead of `.starts_with()`
to get the alias start position, to check the leading range contains only space
characters, and to get the rest of input after the space.

See issue #9339
2021-10-31 15:46:30 +01:00
alexey-milovidov
c504e0c08d
Update ClientBase.cpp 2021-10-30 21:17:38 +03:00
Alexey Milovidov
05c2cd098c Fix parallel formatting and progress flicker in clickhouse-client 2021-10-30 21:02:33 +03:00
kssenii
e97233f33d Fix --verbose in local and logging 2021-10-30 17:23:24 +03:00
Pavel Medvedev
f4e3d053c2 add aliases for \<letter> interactive client commands
initial implementation for:
  * \d aka SHOW TABLES
  * \l aka SHOW DATABASES
  * \c aka USE

Replace prefix of interactive `input` string with an aliased command
inside of the loop of `ClientBase::runInteractive()` in order to allow
command parameters, like `\c db_name`.

See issue #9339
2021-10-30 09:00:45 +02:00
kssenii
07bab5193f Delayed interactive 2021-10-29 16:23:53 +03:00
Artur
89d8fb7622 correct test 2021-10-28 21:23:58 +00:00
Artur
72685d0c78 refactoring and test improvement 2021-10-28 18:46:51 +00:00
mergify[bot]
c1bff1b17d
Merge branch 'master' into stress-test 2021-10-28 14:53:30 +00:00
Alexey Milovidov
8b4a6a2416 Remove cruft 2021-10-28 02:10:39 +03:00
mergify[bot]
d9d9d38e4f
Merge branch 'master' into stress-test 2021-10-27 19:00:31 +00:00
Artur
20c5e9d321 refactoring, adding tests for local 2021-10-26 15:16:58 +00:00
zhangxiao871
bf9aebac90 Fix test and build 2021-10-26 12:45:09 +08:00
Nikolai Kochetov
05f42e2d07 Merge branch 'master' into refactor-pipeline-executor 2021-10-25 12:09:38 +03:00
Kruglov Pavel
855b10261c
Merge pull request #30285 from kssenii/fix-local-exceptions
Fix printing stacktraces for clickhouse-local
2021-10-24 19:54:59 +03:00
Azat Khuzhin
83d68246c3 Fix LOGICAL_ERROR on connection draining in case of ECONNRESET
In case of ECONNRESET (Connection reset by peer) the "cancelled" will
not be set, and so drain() will fail with LOGICAL_ERROR:

<details>

    2021.10.16 04:10:55.054771 [ 7635 ] {882164e0-ca26-4955-8759-708ba1f6e85c} <Error> PullingAsyncPipelineExecutor: Code: 210. DB::NetException: Connection reset by peer, while writing to socket (127.0.0.2:9000). (NETWORK_ERROR), Stack trace (when copying this message, always include the lines below):

    ...
    4. ./obj-x86_64-linux-gnu/../src/Common/NetException.h:12: DB::NetException::NetException(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x20db5749 in /usr/bin/clickhouse
    5. ./obj-x86_64-linux-gnu/../src/IO/WriteBufferFromPocoSocket.cpp:56: DB::WriteBufferFromPocoSocket::nextImpl() @ 0x211d56bb in /usr/bin/clickhouse
    6. ./obj-x86_64-linux-gnu/../src/IO/WriteBuffer.h:47: DB::WriteBuffer::next() @ 0x14e4c874 in /usr/bin/clickhouse
    7. ./obj-x86_64-linux-gnu/../src/Client/Connection.cpp:560: DB::Connection::sendCancel() @ 0x227c0c22 in /usr/bin/clickhouse
    8. ./obj-x86_64-linux-gnu/../src/Client/HedgedConnections.cpp:242: DB::HedgedConnections::sendCancel() @ 0x227f1b53 in /usr/bin/clickhouse
    ...
    2021.10.16 04:12:35.555530 [ 5575 ] {} <Fatal> : Logical error: 'Cannot drain connections: cancel first.'.

</details>

Found by stress tests on CI [1].

  [1]: https://clickhouse-test-reports.s3.yandex.net/0/d3cb99701d4aaec384fd183168d10e0f650ecc1d/stress_test_(debug).html#fail1
2021-10-23 22:44:32 +03:00
Filatenkov Artur
2384108ea5
remove trailing whitespaces 2021-10-22 15:32:24 +03:00
zhangxiao871
4e49eba087 Fix data race 2021-10-22 20:23:25 +08:00
Filatenkov Artur
328a605f7e
Merge branch 'ClickHouse:master' into add_parallel_reading_from_infile 2021-10-22 15:20:00 +03:00
Azat Khuzhin
b0984a3337 clickhouse-local: fix block lost in interactive mode
In case only one block in the query execution, LocalConnection can
return Progress packet instead of the block itself, after it will call
poll() again and the block will got lost.

Fix this by processing block before Progress packet.

And actually AFAICS Progress can be removed after pollImpl(), since
there is Progress handling before.

Fixes: #30282 (cc @kssenii)
2021-10-22 00:46:01 +03:00
zhangxiao871
6cd0f18bfd Fix PVS check 2021-10-21 17:59:24 +08:00
zhangxiao871
ac421b7faf Fix conflicts 2021-10-21 15:50:38 +08:00
zhangxiao871
e6cf9605a5 Refactor and add test. 2021-10-21 15:46:34 +08:00
mergify[bot]
943a1cbba0
Merge branch 'master' into stress-test 2021-10-21 04:41:23 +00:00
kssenii
ec7c93728b Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into fix-local-exceptions 2021-10-20 23:42:27 +00:00
Kseniia Sumarokova
cae31437e8
Merge pull request #30336 from kssenii/fix-local-defaults
Send table columns in clickhouse-local
2021-10-20 21:18:02 +03:00
zhangxiao871
8480ae631a Refactor and add test. 2021-10-20 16:35:37 +08:00
Kseniia Sumarokova
5324cc8359
Merge pull request #30282 from kssenii/fix-local-less-threads
Less threads in clickhouse-local, fix Ok. printing
2021-10-19 22:54:28 +03:00
Nikolai Kochetov
171a6e35ce Fix build. 2021-10-19 21:39:34 +03:00
Nikolai Kochetov
1e1bd568ac Merge branch 'master' into refactor-pipeline-executor 2021-10-19 17:57:58 +03:00
Maksim Kita
0b3926950d
Merge pull request #30143 from amosbird/useupstreamreplxx
Use upstream replxx
2021-10-19 17:50:43 +03:00
Ilya Yatsishin
4396daeb1f
Merge pull request #30064 from azat/client-print-profile-events 2021-10-19 12:42:09 +03:00
kssenii
4bf1f2ca12 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into fix-local-exceptions 2021-10-19 08:28:47 +00:00
Azat Khuzhin
424bf6fcf4 client: add ability to print raw profile events
This can be useful for debugging and for testing (since you will not
need to obtain query_id and look at query_log).

v2:
- mark test as long
- add option to docs
- add type of profile event into logs too
v3:
- resolve conflicts
- and fix onProfileEvents callback
v4:
- add --print-profile-events separate switch
2021-10-19 00:54:38 +03:00
kssenii
b7a53df9de Send columns description in clickhouse-local 2021-10-18 14:53:42 +00:00
Nikolay Degterinsky
d76976e272 Merge branch 'master' into query_parameters 2021-10-18 17:34:20 +03:00
Kruglov Pavel
003955b59f
Merge branch 'master' into clickhouse-local 2021-10-18 14:24:08 +03:00
kssenii
1cc511789d Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into fix-local-less-threads 2021-10-18 08:30:59 +00:00
Nikolai Kochetov
bfcbf5abe0 Merge branch 'master' into removing-data-streams-folder 2021-10-17 10:42:37 +03:00
kssenii
4390dde76c Fix local break on timeout 2021-10-16 19:50:05 +00:00
kssenii
09e3aec96e Fix local break on timeout 2021-10-16 19:48:51 +00:00
alexey-milovidov
3d2fb2f67b
Merge pull request #30275 from kssenii/fix-local-query-stage
--stage for clickhouse-local
2021-10-16 18:42:28 +03:00
Nikolai Kochetov
a08c98d760 Move some files. 2021-10-16 17:03:50 +03:00
kssenii
5db75f9e77 Better exception 2021-10-16 11:30:24 +00:00
kssenii
9525437499 Less threads in local, fix Ok. printing 2021-10-16 10:25:39 +00:00
kssenii
6c0eaf76da Query stage for local 2021-10-16 08:43:18 +00:00
Nikolai Kochetov
067eaadadd Merge branch 'master' into removing-data-streams-folder 2021-10-16 09:46:05 +03:00