You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/03/14 07:57:41 UTC
[iotdb] branch IOTDB-2734 created (now 14cc09a)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-2734
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 14cc09a [IOTDB-2734] Correct result type name in ResultMetadata
This branch includes the following new commits:
new 14cc09a [IOTDB-2734] Correct result type name in ResultMetadata
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.
[iotdb] 01/01: [IOTDB-2734] Correct result type name in ResultMetadata
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch IOTDB-2734
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 14cc09a0713d720b1a60b318635916223a875548
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Mar 14 15:56:21 2022 +0800
[IOTDB-2734] Correct result type name in ResultMetadata
---
.../db/integration/IoTDBResultMetadataIT.java | 81 ++++++++++++++++++++++
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 29 ++------
2 files changed, 85 insertions(+), 25 deletions(-)
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBResultMetadataIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBResultMetadataIT.java
new file mode 100644
index 0000000..cb7d1b1
--- /dev/null
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBResultMetadataIT.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.integration;
+
+import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.integration.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterTest;
+import org.apache.iotdb.itbase.category.LocalStandaloneTest;
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+
+import java.sql.*;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the
+ * IoTDB server should be defined as integration test.
+ */
+@Category({LocalStandaloneTest.class, ClusterTest.class})
+public class IoTDBResultMetadataIT {
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvironmentUtils.envSetUp();
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("create timeseries root.sg.dev.status with datatype=text,encoding=PLAIN;");
+ statement.execute("insert into root.sg.dev(time,status) values(1,3.14);");
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvironmentUtils.cleanEnv();
+ }
+
+ @Test
+ public void columnTypeTest() {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ long lastTimestamp;
+ try (ResultSet resultSet = statement.executeQuery("select status from root.sg.dev")) {
+ Assert.assertTrue(resultSet.next());
+ ResultSetMetaData metaData = resultSet.getMetaData();
+ assertEquals(2, metaData.getColumnCount());
+ assertEquals("Time", metaData.getColumnName(1));
+ assertEquals(Types.TIMESTAMP, metaData.getColumnType(1));
+ assertEquals("TIME", metaData.getColumnTypeName(1));
+ assertEquals("root.sg.dev.status", metaData.getColumnName(2));
+ assertEquals(Types.VARCHAR, metaData.getColumnType(2));
+ assertEquals("TEXT", metaData.getColumnTypeName(2));
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java
index 7bdda65..b45fdf4 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBResultMetadata.java
@@ -209,12 +209,7 @@ public class IoTDBResultMetadata implements ResultSetMetaData {
if (column == 1 && !ignoreTimestamp) {
return "TIME";
}
- String columnType;
- if (!ignoreTimestamp) {
- columnType = columnTypeList.get(column - 2);
- } else {
- columnType = columnTypeList.get(column - 1);
- }
+ String columnType = columnTypeList.get(column - 1);
String typeString = columnType.toUpperCase();
if ("BOOLEAN".equals(typeString)
|| "INT32".equals(typeString)
@@ -233,12 +228,7 @@ public class IoTDBResultMetadata implements ResultSetMetaData {
if (column == 1 && !ignoreTimestamp) {
return 13;
}
- String columnType;
- if (!ignoreTimestamp) {
- columnType = columnTypeList.get(column - 2);
- } else {
- columnType = columnTypeList.get(column - 1);
- }
+ String columnType = columnTypeList.get(column - 1);
switch (columnType.toUpperCase()) {
case "BOOLEAN":
return 1;
@@ -264,12 +254,7 @@ public class IoTDBResultMetadata implements ResultSetMetaData {
if (column == 1 && !ignoreTimestamp) {
return 0;
}
- String columnType;
- if (!ignoreTimestamp) {
- columnType = columnTypeList.get(column - 2);
- } else {
- columnType = columnTypeList.get(column - 1);
- }
+ String columnType = columnTypeList.get(column - 1);
switch (columnType.toUpperCase()) {
case "BOOLEAN":
case "INT32":
@@ -299,13 +284,7 @@ public class IoTDBResultMetadata implements ResultSetMetaData {
return "TIME";
}
// Temporarily use column names as table names
- String columName;
- if (!ignoreTimestamp) {
- columName = columnInfoList.get(column - 2);
- } else {
- columName = columnInfoList.get(column - 1);
- }
- return columName;
+ return columnInfoList.get(column - 1);
}
@Override