From cba1645e2ccb42767ba01273250cb01d0b4fa985 Mon Sep 17 00:00:00 2001
From: serebrserg <serebrserg@yandex-team.ru>
Date: Tue, 29 Mar 2016 17:02:43 +0300
Subject: [PATCH] METR-20494: expose name->columnNum metadata
---
.../ru/yandex/metrika/clickhouse/CHStatementImpl.java | 9 ++++++---
.../yandex/metrika/clickhouse/copypaste/CHResultSet.java | 6 +++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
index afddcb25..f551e1f0 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
@@ -125,12 +125,15 @@ public class CHStatementImpl implements CHStatement {
@Override
public boolean execute(String sql) throws SQLException {
- executeQuery(sql);
+ ResultSet rs = null;
+ try {
+ rs = executeQuery(sql);
+ } finally {
+ CopypasteUtils.close(rs);
+ }
return true;
}
-
-
@Override
public void close() throws SQLException {
if (currentResult != null) {
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CHResultSet.java b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CHResultSet.java
index 6aeff191..ea899a59 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CHResultSet.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CHResultSet.java
@@ -127,7 +127,7 @@ public class CHResultSet extends AbstractResultSet {
return columns;
}
- Map<String, Integer> getCol() {
+ public Map<String, Integer> getCol() {
return col;
}
@@ -440,4 +440,8 @@ public class CHResultSet extends AbstractResultSet {
public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
return getObject(asColNum(columnLabel), type);
}
+
+ public ByteFragment[] getValues() {
+ return values;
+ }
}
--
GitLab