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 02:33:01 UTC
[incubator-iotdb] branch fix_grafana_issue created (now 4dc2cb6)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_grafana_issue
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 4dc2cb6 fix getting timeseries list error in grafana connector
This branch includes the following new commits:
new 4dc2cb6 fix getting timeseries list error in grafana connector
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: fix getting timeseries list error in
grafana connector
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_grafana_issue
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 4dc2cb653212739259b6affa9b0f95f0c1a20705
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()) {