Skip to content

support Explain queries, isSelect must be true for them #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhicwu merged 2 commits into from
Dec 28, 2020
Merged

support Explain queries, isSelect must be true for them #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecf6ff5
support Explain queries, isSelect must be true for them
Dec 23, 2020
d8f6334
Fix leaking code from another branch
Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/ru/yandex/clickhouse/ClickHouseStatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class ClickHouseStatementImpl implements ClickHouseStatement {
*/
private final String initialDatabase;

private static final String[] selectKeywords = new String[]{"SELECT", "WITH", "SHOW", "DESC", "EXISTS"};
private static final String[] selectKeywords = new String[]{"SELECT", "WITH", "SHOW", "DESC", "EXISTS", "EXPLAIN"};
private static final String databaseKeyword = "CREATE DATABASE";

public ClickHouseStatementImpl(CloseableHttpClient client, ClickHouseConnection connection,
Expand Down Expand Up @@ -845,6 +845,7 @@ void sendStream(Writer writer, HttpEntity content) throws ClickHouseException {
content = applyRequestBodyCompression(content);

HttpPost httpPost = new HttpPost(uri);

httpPost.setEntity(content);
HttpResponse response = client.execute(httpPost);
entity = response.getEntity();
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/ru/yandex/clickhouse/ClickHouseStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ public void testIsSelect() {
assertFalse(ClickHouseStatementImpl.isSelect("/*"));
assertFalse(ClickHouseStatementImpl.isSelect("/**/"));
assertFalse(ClickHouseStatementImpl.isSelect(" --"));
assertTrue(ClickHouseStatementImpl.isSelect("explain select 42"));
assertTrue(ClickHouseStatementImpl.isSelect("EXPLAIN select 42"));
assertFalse(ClickHouseStatementImpl.isSelect("--EXPLAIN select 42\n alter"));
assertTrue(ClickHouseStatementImpl.isSelect("--\nEXPLAIN select 42"));
assertTrue(ClickHouseStatementImpl.isSelect("/*test*/ EXPLAIN select 42"));
}

}