You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/08/27 03:12:43 UTC
[iotdb] branch issue-3811-rename-column created (now d7ef34a)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch issue-3811-rename-column
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at d7ef34a fix tests
This branch includes the following new commits:
new f4b31ce rename column name from type to dataType
new d7ef34a fix tests
The 2 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/02: rename column name from type to dataType
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch issue-3811-rename-column
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f4b31ce4cc9e13827b7b6b4fa546e0d0d6139603
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Aug 27 11:05:18 2021 +0800
rename column name from type to dataType
---
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 ++--
3 files changed, 4 insertions(+), 5 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);
[iotdb] 02/02: fix tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch issue-3811-rename-column
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d7ef34ad0e5f3759beb720cce9fa1f6844075fad
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Aug 27 11:07:54 2021 +0800
fix tests
---
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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()) {