You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/08/27 03:55:15 UTC
[iotdb] branch rel/0.12 updated: [To rel/0.12][ISSUE-3811] Rename
the data type column name of last query dataset to dataType (#3852)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new b998703 [To rel/0.12][ISSUE-3811] Rename the data type column name of last query dataset to dataType (#3852)
b998703 is described below
commit b9987034dd630ad1a094d2cbd10d4ff66c4980be
Author: Steve Yurong Su (宇荣) <ro...@apache.org>
AuthorDate: Thu Aug 26 22:54:54 2021 -0500
[To rel/0.12][ISSUE-3811] Rename the data type column name of last query dataset to dataType (#3852)
---
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 1 -
.../java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java | 4 ++--
server/src/main/java/org/apache/iotdb/db/service/StaticResps.java | 4 ++--
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 28bce70..6ef28c7 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -73,7 +73,6 @@ public class IoTDBConstant {
public static final String COLUMN_COUNT = "count";
public static final String COLUMN_TAGS = "tags";
public static final String COLUMN_ATTRIBUTES = "attributes";
- public static final String COLUMN_TYPE = "type";
public static final String QUERY_ID = "queryId";
public static final String STATEMENT = "statement";
diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
index fd0da23..6e4f204 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
@@ -57,7 +57,7 @@ import java.util.Map;
import java.util.Set;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES;
-import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TYPE;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE;
public class LastQueryExecutor {
@@ -94,7 +94,7 @@ public class LastQueryExecutor {
Arrays.asList(
new PartialPath(COLUMN_TIMESERIES, false),
new PartialPath(COLUMN_VALUE, false),
- new PartialPath(COLUMN_TYPE, false)),
+ new PartialPath(COLUMN_TIMESERIES_DATATYPE, false)),
Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
List<Pair<Boolean, TimeValuePair>> lastPairList =
diff --git a/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java b/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
index 15c2f0e..5c6e042 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
import java.util.List;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES;
-import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TYPE;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE;
/** Static responses that won't change for all requests. */
@@ -40,7 +40,7 @@ class StaticResps {
static final TSExecuteStatementResp LAST_RESP =
getExecuteResp(
- Arrays.asList(COLUMN_TIMESERIES, COLUMN_VALUE, COLUMN_TYPE),
+ Arrays.asList(COLUMN_TIMESERIES, COLUMN_VALUE, COLUMN_TIMESERIES_DATATYPE),
Arrays.asList(
TSDataType.TEXT.toString(), TSDataType.TEXT.toString(), TSDataType.TEXT.toString()),
false);
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java
index 9be6e6b..ef87918 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java
@@ -532,7 +532,7 @@ public class IoTDBAsIT {
for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
header.append(resultSetMetaData.getColumnName(i)).append(",");
}
- assertEquals("Time,timeseries,value,type,", header.toString());
+ assertEquals("Time,timeseries,value,dataType,", header.toString());
int cnt = 0;
while (resultSet.next()) {
@@ -573,7 +573,7 @@ public class IoTDBAsIT {
for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
header.append(resultSetMetaData.getColumnName(i)).append(",");
}
- assertEquals("Time,timeseries,value,type,", header.toString());
+ assertEquals("Time,timeseries,value,dataType,", header.toString());
int cnt = 0;
while (resultSet.next()) {