thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,920 Commits 9,324 Branches 1,783 Tags 2.1 GiB
c49eefda2c
Commit Graph

1078 Commits

Author SHA1 Message Date
Nikita Mikhaylov
817b52314e Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel_parsing 2019-11-05 12:32:26 +03:00
Amos Bird
8f902dc2a9
Better null format for tcp handler. 2019-11-04 11:53:26 +08:00
alexey-milovidov
f5531fb436
Merge pull request #7590 from amosbird/typetrait 
ubsan fix
 2019-11-02 13:22:39 +03:00
proller
6a573b4092 Allow to use mysql format without ssl - try2 with mysql interface split (#7524) 
* Allow use mysql format without ssl

* fix

* fix

*  fix

* Also disable poco's optional libraries

* clean

* fix

* fix

* Requested changes

* clean

* Requested fixes

* Update MySQLHandler.cpp
 2019-11-02 13:20:46 +03:00
Amos Bird
ad12099642
ubsan fix 2019-11-02 17:00:03 +08:00
Amos Bird
4609ca3189
Enable bracketed paste if possible 2019-10-31 02:33:45 +08:00
Nikita Mikhaylov
756a10707d Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel_parsing 2019-10-28 13:51:52 +03:00
Alexander Kuzmenkov
c3ea94209b
Merge pull request #7491 from traceon/odbc-bridge-type-mapping-fix 
Add handling of SQL_TINYINT and SQL_BIGINT, fix SQL_FLOAT in ODBC Bridge
 2019-10-28 13:30:18 +03:00
Denis Glazachev
8e48430159 Add handling of SQL_TINYINT and SQL_BIGINT 
Fix handling of SQL_FLOAT
 2019-10-25 21:49:49 +04:00
alesapin
04ca163518 Merge branch 'master' into dictionaries_ddl_loader 2019-10-25 10:58:04 +03:00
Alexander Kuzmenkov
29052b6a37
Merge pull request #7377 from azat/INSERT-Distributed-MATERIALIZED-cols 
* Fix INSERT into Distributed non local node with MATERIALIZED columns

Previous patch e527def18a ("Fix INSERT
into Distributed() table with MATERIALIZED column") fixes it only for
cases when the node is local, i.e. direct insert.

This patch address the problem when the node is not local
(`is_local == false`), by erasing materialized columns on INSERT into
Distributed.

And this patch fixes two cases, depends on `insert_distributed_sync`
setting:

- `insert_distributed_sync=0`

    ```
    Not found column value in block. There are only columns: date. Stack trace:

    2. 0x7ffff7be92e0 DB::Exception::Exception() dbms/src/Common/Exception.h:27
    3. 0x7fffec5d6cf6 DB::Block::getByName(...) dbms/src/Core/Block.cpp:187
    4. 0x7fffec2fe067 DB::NativeBlockInputStream::readImpl() dbms/src/DataStreams/NativeBlockInputStream.cpp:159
    5. 0x7fffec2d223f DB::IBlockInputStream::read() dbms/src/DataStreams/IBlockInputStream.cpp:61
    6. 0x7ffff7c6d40d DB::TCPHandler::receiveData() dbms/programs/server/TCPHandler.cpp:971
    7. 0x7ffff7c6cc1d DB::TCPHandler::receivePacket() dbms/programs/server/TCPHandler.cpp:855
    8. 0x7ffff7c6a1ef DB::TCPHandler::readDataNext(unsigned long const&, int const&) dbms/programs/server/TCPHandler.cpp:406
    9. 0x7ffff7c6a41b DB::TCPHandler::readData(DB::Settings const&) dbms/programs/server/TCPHandler.cpp:437
    10. 0x7ffff7c6a5d9 DB::TCPHandler::processInsertQuery(DB::Settings const&) dbms/programs/server/TCPHandler.cpp:464
    11. 0x7ffff7c687b5 DB::TCPHandler::runImpl() dbms/programs/server/TCPHandler.cpp:257
    ```

- `insert_distributed_sync=1`

    ```
    2019.10.18 13:23:22.114578 [ 44 ] {a78f669f-0b08-4337-abf8-d31e958f6d12} <Error> executeQuery: Code: 171, e.displayText() = DB::Exception: Block structure mismatch in RemoteBlockOutputStream stream: different number of columns:
    date Date UInt16(size = 1), value Date UInt16(size = 1)
    date Date UInt16(size = 0): Insertion status:
    Wrote 1 blocks and 0 rows on shard 0 replica 0, 127.0.0.1:59000 (average 0 ms per block)
    Wrote 0 blocks and 0 rows on shard 1 replica 0, 127.0.0.2:59000 (average 2 ms per block)
     (version 19.16.1.1) (from [::1]:3624) (in query: INSERT INTO distributed_00952 VALUES ), Stack trace:

    2. 0x7ffff7be92e0 DB::Exception::Exception() dbms/src/Common/Exception.h:27
    3. 0x7fffec5da4e9 DB::checkBlockStructure<void>(...)::{...}::operator()(...) const dbms/src/Core/Block.cpp:460
    4. 0x7fffec5da671 void DB::checkBlockStructure<void>(...) dbms/src/Core/Block.cpp:467
    5. 0x7fffec5d8d58 DB::assertBlocksHaveEqualStructure(...) dbms/src/Core/Block.cpp:515
    6. 0x7fffec326630 DB::RemoteBlockOutputStream::write(DB::Block const&) dbms/src/DataStreams/RemoteBlockOutputStream.cpp:68
    7. 0x7fffe98bd154 DB::DistributedBlockOutputStream::runWritingJob(DB::DistributedBlockOutputStream::JobReplica&, DB::Block const&)::{lambda()#1}::operator()() const dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp:280
    <snip>
    ````

Fixes: #7365
Fixes: #5429
Refs: #6891

* Cover INSERT into Distributed with MATERIALIZED columns and !is_local node

I guess that adding new cluster into server-test.xml is not required,
but it won't harm.

* Update DistributedBlockOutputStream.cpp
 2019-10-24 12:35:09 +03:00
alesapin
a6199b7e69 Merge with master 2019-10-24 12:33:40 +03:00
Azat Khuzhin
80cf86f100 Cover INSERT into Distributed with MATERIALIZED columns and !is_local node 
I guess that adding new cluster into server-test.xml is not required,
but it won't harm.
 2019-10-23 21:55:08 +03:00
Amos Bird
295864e6e0
better scalar query 2019-10-23 21:37:54 +08:00
Nikita Mikhaylov
34d8ade4a0 Merge branch 'master' of github.com:ClickHouse/ClickHouse into parallel_parsing 2019-10-22 15:56:51 +03:00
Alexander Kuzmenkov
9c1f8109c7
Merge pull request #7402 from Enmk/odbc_bridge_nullable_fix 
Fixed NULL-values in nullable columns through ODBC-bridge
 2019-10-21 19:09:27 +03:00
alesapin
ff7850cfbd Remove strange code in favor of less strange code 2019-10-21 17:59:35 +03:00
Vasily Nemkov
e080324fd0 Fixed NULL-values in nullable columns through ODBC-bridge 2019-10-21 12:13:33 +03:00
alesapin
35e66d6696 Merge with master 2019-10-21 11:46:11 +03:00
millb
f64f6658ce Merge branch 'master' into url_engine_problem 2019-10-21 11:44:31 +03:00
alesapin
cdc195727e Fix some races from lazy load and add ugly interface to loader (need to be refactored) 2019-10-18 19:04:09 +03:00
tavplubix
0046b9f137 Wait for jobs to finish on exception (fixes rare segfaults) (#7350) 2019-10-17 17:41:27 +03:00
alesapin
155731a676 Merge branch 'master' into dictionaries_ddl_interpreter 2019-10-14 11:49:18 +03:00
Vitaly Baranov
18ccb4d64d Move backQuote() and quoteString() to a separate file, use StringRefs. 2019-10-11 00:18:52 +03:00
Vitaly Baranov
12d1d87d64 Move authentication code to a separate class. 2019-10-11 00:18:52 +03:00
alesapin
2a5713e6e4 Compilable code 2019-10-10 23:47:47 +03:00
millb
350f0b8a1c Merge remote-tracking branch 'origin/url_engine_problem' into url_engine_problem 2019-10-10 16:47:17 +03:00
millb
a00089f0b4 Renamed StorageOfAllowedURL -> RemoteHostFilter 2019-10-10 15:58:06 +03:00
Mikhail Korotov
769ec9ea6c
Update config.xml 2019-10-10 01:22:05 +03:00
millb
a97739f67f Created class StorageOfAllowedURL 
Created test for table function remote and remoteSecure
Created check allowed url in remote and remoteSecure
Fixed tests
 2019-10-09 23:29:41 +03:00
Alexey Milovidov
a19f6513ce Added example config with macros 2019-10-09 04:15:23 +03:00
alexey-milovidov
5c2d478543
Merge pull request #7212 from ClickHouse/aku/field-includes 
Include Field.h and FieldVisitor.h into fewer files.
 2019-10-08 22:40:30 +03:00
alexey-milovidov
b9aa5d812d
Merge pull request #7171 from nikvas0/nikvas0/lazy_db 
Lazy Database
 2019-10-08 22:15:55 +03:00
Alexander Kuzmenkov
367c537106 Do not include Field.h everywhere through SettingsCommon.h. 
Move the methods of SettingsCollection<> that are dependent on Field to
a separate file, and include it once for each instantiation. This allows
to work on Field without always recompiling the entire project.
 2019-10-07 20:23:05 +03:00
proller
594c535bd4 Build fixes (#7063) 
* Build fixes

*            fix

* Fix

* fix

* Fix install(export..

* Freebsd fixes

* Freebsd fixes

* Fix warning

* fix

* More PRIVATE linking

* Fix review

* Timmy

* fix

* fix
 2019-10-05 22:25:31 +03:00
Alexander Tokmakov
a58996817f allow query parameters in Values 2019-10-02 22:54:40 +03:00
Vasilyev Nikita
5793a02ef9 impr Lazy database 2019-10-01 15:44:17 +03:00
Nikita Mikhaylov
d47d4cd6c1 parallel parsing 2019-10-01 13:48:46 +03:00
Azat Khuzhin
740e4c5851
Avoid use of uninitialized values in MetricsTransmitter 
Defer thread creation after values had been initialized correctly.
 2019-10-01 10:16:39 +03:00
millb
9246f258e8 Created ability to configure allowed URL in config.xml without tests. 2019-09-30 18:29:05 +03:00
Amos Bird
dadc613072 Get rid of malloc symbols in libcommon (#7134) 2019-09-30 14:58:32 +03:00
alesapin
4fdb5a61e5 Rename ExternalDictionaries to ExternalDictionariesLoader 2019-09-26 13:41:33 +03:00
Alexander Kuzmenkov
f3bde19b74 Do not use iterators in find() and emplace() methods of hash tables. 
Instead, these methods return a pointer to the required data as they are
stored inside the hash table. The caller uses overloaded functions to
get the key and "mapped" values from this pointer. Such an interface
avoids the need for constructing iterator-like wrapper objects, which is
especially important for compound hash tables such as the future
StringHashMap.
 2019-09-24 17:44:35 +03:00
Ivan Lezhankin
4b143c3e0f Merge remote-tracking branch 'upstream/master' into issue-6459 2019-09-23 16:07:19 +03:00
Alexey Milovidov
70bc89557f Updates for #6969 2019-09-23 01:57:06 +03:00
Azat Khuzhin
59763cbb3a
Add ability to send events with absolute values to graphite 
<events> sends only deltas for events, while sometimes it is more
convenient to get absolute values (for example to calculate rate).

This patch introduces another directive -- <events_absolute> that will handle
this.

v0: use <events> as bool/string
v2: use <events_absolute>true</events_absolute> over <events>absolute</events>
 2019-09-21 02:46:47 +03:00
Ivan Lezhankin
9e46118edd Merge remote-tracking branch 'upstream/master' into issue-6459 2019-09-20 21:25:55 +03:00
Ivan Lezhankin
8cb0e58bc7 Fix build for all targets 2019-09-20 21:13:51 +03:00
alexey-milovidov
d8cd375c8b
Merge pull request #6958 from proller/fix25 
Build fixes
 2019-09-18 01:48:46 +03:00
alesapin
110568f980
Merge pull request #6947 from yandex/add_gdb_index 
Add gdb index to builds with debug info
 2019-09-17 17:59:27 +03:00
proller
e7f069c78c fixes 2019-09-17 12:33:46 +00:00
alesapin
33c3f7a6a2 Add gdb-index for gold linker with gdb-add-index tool 2019-09-17 12:49:27 +03:00
alesapin
719854b49b
Merge pull request #6939 from dimarub2000/perfomance_test_all_of 
all_of setting in performance-test now works properly
 2019-09-16 13:04:23 +03:00
Ivan Lezhankin
8c356a3830 WIP 2019-09-15 18:20:31 +03:00
Ivan Lezhankin
01fdb802d4 Useful changes 2019-09-15 13:35:12 +03:00
dimarub2000
24d0055dc8 Typo 2019-09-13 19:24:59 +03:00
dimarub2000
26b1bc2093 all_of setting now works properly 2019-09-13 19:18:26 +03:00
alesapin
02cff38fef Merge with master 2019-09-13 13:58:23 +03:00
Nikolai Kochetov
86bee0b8b5
Merge pull request #6684 from yandex/processors-2 
Processors 2
 2019-09-13 11:58:04 +03:00
alexey-milovidov
12c26e6013
Merge pull request #6891 from yandex/low_cardinality_in_native_http 
Low cardinality in native http
 2019-09-13 09:01:08 +03:00
Nikolai Kochetov
1319168a3a Merge branch 'master' into processors-2 2019-09-12 16:28:51 +03:00
Nikolai Kochetov
d7596e51b7 Removed convert_types_to_low_cardinality from NativeBlockInputStream. 2019-09-12 14:33:46 +03:00
alexey-milovidov
c5cf4fa4f4
Merge pull request #6878 from azat-archive/build--fixes 
Trivial build fixes (mostly for -DSPLIT_SHARED_LIBRARIES=ON)
 2019-09-12 03:25:19 +03:00
Azat Khuzhin
d682a271ff
Missing Poco XML for copier (fixes -DSPLIT_SHARED_LIBRARIES=OFF build) 2019-09-12 02:04:43 +03:00
Amos Bird
93c0880ca7 Fix non-ssl build. 2019-09-12 04:20:27 +08:00
alexey-milovidov
6b1352f65c
Merge pull request #6893 from malkfilipp/client_older_than_server 
Display warning if clickhouse-client version is older than clickhouse-server.
 2019-09-11 16:02:35 +03:00
malkfilipp
62f85c0a3a Switch to tuples 2019-09-11 11:41:57 +03:00
malkfilipp
b63d2422d0 Change versions comparing from string to number 2019-09-11 01:29:21 +03:00
alexey-milovidov
8fa72c6804
Update Client.cpp 2019-09-10 23:10:23 +03:00
malkfilipp
058c04e759 Add a warning if the client is older than the server 2019-09-10 22:28:33 +03:00
Amos Bird
a1310ffbe6 Split libdbms.so using object library 
Now the linking time of incremental builds are around 1-2 seconds
 2019-09-11 01:56:01 +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
alesapin
27419c965e Merge with master 2019-09-09 14:13:36 +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
Mikhail Filimonov
34f393c17e Ability to change history path by changing env 2019-09-06 01:35:25 +02:00
CurtizJ
b04cea7463 minor fixes of table function input 2019-09-05 16:17:01 +03:00
alesapin
b71faee8cd Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-09-05 13:19:05 +03:00
Alexey Milovidov
a4c1d64aba Allowed to run test with the server run from source tree 2019-09-05 07:50:08 +03:00
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