Alexander Tokmakov
b29bddac12
Merge branch 'master' into database_atomic
2020-04-20 14:09:09 +03:00
zhang2014
318ab3b51e
ISSUES-5436 try fix build failure & pvs & style
2020-04-20 12:49:17 +08:00
Alexey Milovidov
1d885b3ff9
Merge branch 'master' into quota-key-in-client
2020-04-20 02:15:37 +03:00
Alexey Milovidov
2987e70aab
Introduce "max_server_memory_usage" setting
2020-04-20 01:59:21 +03:00
Alexey Milovidov
ec6b176f3b
Rework total memory tracker #10293
2020-04-20 01:59:21 +03:00
zhang2014
57cbecf935
ISSUES-5436 reworking predefine http
2020-04-20 03:18:36 +08:00
zhang2014
835dc4c445
After merge upsream master fix
2020-04-20 02:26:42 +08:00
zhang2014
b82eee5255
ISSUES-5436 fix review suggestions & add some '?' re2 test
2020-04-20 02:26:26 +08:00
zhang2014
8105a9bbe0
ISSUES-5436 fix review suggestions
2020-04-20 02:26:06 +08:00
tai
dafba9d66a
ISSUES-5436 add integration test for custom http
2020-04-20 02:25:43 +08:00
zhang2014
847f7ab439
ISSUES-5436 fix build failure & fix test failure
2020-04-20 02:25:43 +08:00
zhang2014
6b716e511b
ISSUES-5436 support custom http [part 6]
2020-04-20 02:25:12 +08:00
zhang2014
7aef95b082
ISSUES-5436 support custom http [part 5]
2020-04-20 02:23:18 +08:00
zhang2014
fd00757178
ISSUES-5436 support custom http [part 4]
2020-04-20 02:23:18 +08:00
zhang2014
60abff3341
ISSUES-5436 support custom http [part 3]
2020-04-20 02:23:18 +08:00
zhang2014
183eb82b7c
ISSUES-5436 support custom http [part 2]
2020-04-20 02:23:18 +08:00
zhang2014
159ba24fca
ISSUES-5436 support custom http
2020-04-20 02:23:18 +08:00
Nikolai Kochetov
84faa9af26
Merge branch 'master' into shared-context-lifetime
2020-04-17 19:13:13 +03:00
Nikolai Kochetov
ce11662ab1
Fix build.
2020-04-17 15:58:52 +03:00
Nikolai Kochetov
d51a9c551b
Remove shared_ptr to SharedContext from Context.
2020-04-17 12:47:40 +03:00
alexey-milovidov
17e7d4d88a
Merge pull request #10307 from abyss7/arcadia-4
...
Changes for auto-sync with Arcadia
2020-04-17 05:08:34 +03:00
Nikolai Kochetov
025093d354
Fix build.
2020-04-16 17:51:33 +03:00
Nikolai Kochetov
d6db27e372
Modify context.
2020-04-16 17:37:38 +03:00
Ivan Lezhankin
e230632645
Changes required for auto-sync with Arcadia
2020-04-16 15:31:57 +03:00
alexey-milovidov
a92a6d8e63
Merge pull request #10274 from ClickHouse/avoid-error-message-on-rst
...
Avoid error message on RST
2020-04-15 17:33:35 +03:00
alexey-milovidov
2a48b0ecd7
Merge pull request #10184 from xzkostyan/feature-zookeeper-ssl
...
Optional secured communication between ClickHouse and Zookeeper
2020-04-15 07:09:14 +03:00
Alexey Milovidov
ddd840a81b
Avoid error message on RST
2020-04-15 06:56:42 +03:00
Alexey Milovidov
fe59524481
Implemented in a different way
2020-04-15 04:59:14 +03:00
Alexey Milovidov
c22f91db01
Allow to pass quota_key in clickhouse-client
2020-04-15 04:15:05 +03:00
Alexander Tokmakov
6c0d9723e0
Merge branch 'master' into database_atomic
2020-04-13 18:47:47 +03:00
Alexander Tokmakov
5e6d4b9449
Merge branch 'master' into database_atomic
2020-04-12 16:35:44 +03:00
BohuTANG
e7f399f652
MySQLHandler: max_allowed_packet returned by default when server setup with select variables
2020-04-12 13:37:39 +08:00
Vitaly Baranov
ca634f603a
Revert resetting the settings to their defaults after each query in TCPHandler.
2020-04-10 21:09:59 +03:00
Alexander Tokmakov
033d7f9b32
Merge branch 'master' into database_atomic
2020-04-10 17:12:09 +03:00
Vitaly Baranov
8a19f6d322
Merge pull request #10115 from azat/path.xml-access_control_path
...
Rewrite access_control_path in path.xml
2020-04-09 11:38:08 +03:00
Konstantin Lebedev
b666f60af8
Optional secured communication between ClickHouse and Zookeeper
2020-04-09 01:40:54 +03:00
BohuTANG
f48fdda678
Enhanced compatibility with native mysql-connector-java(JDBC) ( #10021 )
...
* Skip the `/* comments */ SELECT @@variables ...` from mysql-connector-java setup for MySQL Handler #9336
mysql-connector setup query:
/* mysql-connector-java-5.1.38 ( Revision: ${revinfo.commit} ) */SELECT @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_connection, @@character_set_results AS character_set_results, @@character_set_server AS character_set_server, @@init_connect AS init_connect, @@interactive_timeout AS interactive_timeout...
ClickHouse side Error:
{} <Error> executeQuery: Code: 62, e.displayText() = DB::Exception: Syntax error: failed at position 74: @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_conn. Expected one of: CAST, NULL...
Client side Exception:
java.sql.SQLException: Syntax error: failed at position 74: @@session.auto_increment_increment AS auto_increment_increment, @@character_set_client AS character_set_client, @@character_set_connection AS character_set_conn. Expected one of: CAST...
* add repalce 'SHOW VARIABLES' for mysql-connector-java-5.1.34 #9336
* Add java client(JDBC) integration test to test_mysql_protocol
* shift out java tests from dbms
* Update MySQLHandler.cpp
* Update MySQLHandler.cpp
* test_mysql_protocol: add Test.java exit code 1 when expection
Co-authored-by: alexey-milovidov <milovidov@yandex-team.ru>
2020-04-09 00:52:19 +03:00
Alexander Tokmakov
dd1590830b
Merge branch 'master' into database_atomic
2020-04-08 22:00:46 +03:00
Azat Khuzhin
ed25ac8b12
Rewrite access_control_path in path.xml
...
Follow-up for: #9811
2020-04-08 10:45:14 +03:00
Vitaly Baranov
bc3e2cb48c
Add the option "access_control_path" to server config.
2020-04-07 23:31:59 +03:00
Vitaly Baranov
b71ff6160a
Add the "access_management" option to users.xml which enables a user to manage access rights.
...
The option is turned off by default.
2020-04-07 23:31:54 +03:00
Alexander Tokmakov
9c67d2716e
Merge branch 'master' into database_atomic
2020-04-03 03:19:11 +03:00
Ivan
97f2a2213e
Move all folders inside /dbms one level up ( #9974 )
...
* Move some code outside dbms/src folder
* Fix paths
2020-04-02 02:51:21 +03:00
