thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10199 from BohuTANG/mysql_max_packet_size

Browse Source 
MySQLHandler: max_allowed_packet returned by default
This commit is contained in:
alexey-milovidov 2020-04-12 21:58:54 +03:00 committed by GitHub
commit ae737b0e81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/server/MySQLHandler.cpp
View File

@ -284,15 +284,17 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
}
else
{
String replacement_query = "select ''";
String replacement_query = "SELECT ''";
bool should_replace = false;
bool with_output = false;
// Translate query from MySQL to ClickHouse.
// This is a temporary workaround until ClickHouse supports the syntax "@@var_name".
// Required parameters when setup:
// * max_allowed_packet, default 64MB, https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_max_allowed_packet
if (isFederatedServerSetupSelectVarCommand(query))
{
should_replace = true;
replacement_query = "SELECT 67108864 AS max_allowed_packet";
}
// This is a workaround in order to support adding ClickHouse to MySQL using federated server.

4
tests/integration/test_mysql_protocol/clients/java/0.reference
View File

@ -1,5 +1,5 @@
33jdbc
44ck
33jdbcnull
44cknull
0
1
2

7
tests/integration/test_mysql_protocol/clients/java/Test.java
View File

@ -5,8 +5,8 @@ import java.sql.SQLException;
import java.sql.Statement;
class JavaConnectorTest {
private static final String CREATE_TABLE_SQL = "CREATE TABLE IF NOT EXISTS default.test1 (age Int32, name String) Engine = Memory";
private static final String INSERT_SQL = "INSERT INTO default.test1 VALUES(33, 'jdbc'),(44, 'ck')";
private static final String CREATE_TABLE_SQL = "CREATE TABLE IF NOT EXISTS default.test1 (`age` Int32, `name` String, `int_nullable` Nullable(Int32)) Engine = Memory";
private static final String INSERT_SQL = "INSERT INTO default.test1(`age`, `name`) VALUES(33, 'jdbc'),(44, 'ck')";
private static final String SELECT_SQL = "SELECT * FROM default.test1";
private static final String SELECT_NUMBER_SQL = "SELECT * FROM system.numbers LIMIT 13";
private static final String DROP_TABLE_SQL = "DROP TABLE default.test1";
@ -41,7 +41,7 @@ class JavaConnectorTest {
}
}
String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s?maxAllowedPacket=67108864&useSSL=false", host, port, database);
String jdbcUrl = String.format("jdbc:mysql://%s:%s/%s", host, port, database);
Connection conn = null;
Statement stmt = null;
@ -55,6 +55,7 @@ class JavaConnectorTest {
while (rs.next()) {
System.out.print(rs.getString("age"));
System.out.print(rs.getString("name"));
System.out.print(rs.getString("int_nullable"));
System.out.println();
}