You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/07/15 05:32:53 UTC
[incubator-iotdb] branch master updated: fix getting timeseries
list error in grafana connector
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new e734368 fix getting timeseries list error in grafana connector
e734368 is described below
commit e734368a56f280b1f06bc111171afb9d249e97f8
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Jul 15 10:32:44 2019 +0800
fix getting timeseries list error in grafana connector
---
.../main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
index 0cdb425..d9015d7 100644
--- a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
+++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
@@ -25,6 +25,7 @@ import java.sql.SQLException;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
+import org.apache.iotdb.jdbc.Constant;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import org.apache.iotdb.web.grafana.dao.BasicDao;
@@ -56,7 +57,7 @@ public class BasicDaoImpl implements BasicDao {
ConnectionCallback<Object> connectionCallback = new ConnectionCallback<Object>() {
public Object doInConnection(Connection connection) throws SQLException {
DatabaseMetaData databaseMetaData = connection.getMetaData();
- ResultSet resultSet = databaseMetaData.getColumns(null, null, "root.*", null);
+ ResultSet resultSet = databaseMetaData.getColumns(Constant.CATALOG_TIMESERIES, "root.*", "root.*", null);
logger.info("Start to get timeseries");
List<String> columnsName = new ArrayList<>();
while (resultSet.next()) {