This is an automated email from the ASF dual-hosted git repository.
critas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 1a0d4c6294c Parameter Naming Adjustment for the Table Model of REST
Service (#14571)
1a0d4c6294c is described below
commit 1a0d4c6294ca2fec56c7ae737cc87e138180bc86
Author: CloudWise-Lukemiao <[email protected]>
AuthorDate: Fri Dec 27 18:15:19 2024 +0800
Parameter Naming Adjustment for the Table Model of REST Service (#14571)
* Parameter Naming Adjustment for the Table Model of REST Service
* Parameter Naming Adjustment for the Table Model of REST Service
* Parameter Naming Adjustment for the Table Model of REST Service
* Parameter Naming Adjustment for the Table Model of REST Service
---
.../relational/it/rest/it/IoTDBRestServiceIT.java | 12 ++++++------
.../table/v1/handler/RequestValidationHandler.java | 20 ++++++++++++--------
.../v1/handler/StatementConstructionHandler.java | 4 ++--
.../src/main/openapi3/iotdb_rest_table_v1.yaml | 2 +-
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/rest/it/IoTDBRestServiceIT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/rest/it/IoTDBRestServiceIT.java
index 1a1ebb578d9..72ded00787e 100644
---
a/integration-test/src/test/java/org/apache/iotdb/relational/it/rest/it/IoTDBRestServiceIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/rest/it/IoTDBRestServiceIT.java
@@ -276,7 +276,7 @@ public class IoTDBRestServiceIT {
RestUtils.nonQuery(httpClient, port, sqlHandler("test", sql));
}
String json =
-
"{\"database\":\"test\",\"column_types\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
+
"{\"database\":\"test\",\"column_catogories\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
rightInsertTablet(json);
}
@@ -288,7 +288,7 @@ public class IoTDBRestServiceIT {
RestUtils.nonQuery(httpClient, port, sqlHandler("test", sql));
}
String json =
-
"{\"database\":\"\",\"column_types\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
+
"{\"database\":\"\",\"column_catogories\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
JsonObject result = RestUtils.insertTablet(httpClient, port, json);
assertEquals(305, Integer.parseInt(result.get("code").toString()));
}
@@ -301,11 +301,11 @@ public class IoTDBRestServiceIT {
RestUtils.nonQuery(httpClient, port, sqlHandler("test", sql));
}
String json =
-
"{\"database\":\"test\",\"column_types\":[\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"id1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
+
"{\"database\":\"test\",\"column_catogories\":[\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232173960,1635232183960],\"column_names\":[\"id1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
JsonObject result = RestUtils.insertTablet(httpClient, port, json);
assertEquals(305, Integer.parseInt(result.get("code").toString()));
assertEquals(
- "column_names and column_types should have the same size,column_types
and data_types should have the same size",
+ "column_names and column_catogories should have the same
size,column_catogories and data_types should have the same size",
result.get("message").getAsString());
}
@@ -317,11 +317,11 @@ public class IoTDBRestServiceIT {
RestUtils.nonQuery(httpClient, port, sqlHandler("test", sql));
}
String json =
-
"{\"database\":\"test\",\"column_types\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
+
"{\"database\":\"test\",\"column_catogories\":[\"TAG\",\"ATTRIBUTE\",\"FIELD\"],\"timestamps\":[1635232143960,1635232153960,1635232163960,1635232183960],\"column_names\":[\"tag1\",\"t1\",\"s1\"],\"data_types\":[\"STRING\",\"STRING\",\"FLOAT\"],\"values\":[[\"a11\",\"true\",11],[\"a11\",\"false\",22],[\"a13\",\"false1\",23],[\"a14\",\"false2\",24],[\"a15\",\"false3\",25]],\"table\":\"sg211\"}";
JsonObject result = RestUtils.insertTablet(httpClient, port, json);
assertEquals(305, Integer.parseInt(result.get("code").toString()));
assertEquals(
- "values and data_types should have the same size",
result.get("message").getAsString());
+ "values and timestamps should have the same size",
result.get("message").getAsString());
}
public void rightInsertTablet(String json) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/RequestValidationHandler.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/RequestValidationHandler.java
index 81624ba9031..b07a3269c99 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/RequestValidationHandler.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/RequestValidationHandler.java
@@ -50,22 +50,24 @@ public class RequestValidationHandler {
Objects.requireNonNull(insertTabletRequest.getDatabase(), "database should
not be null");
Objects.requireNonNull(insertTabletRequest.getTable(), "table should not
be null");
Objects.requireNonNull(insertTabletRequest.getColumnNames(), "column_names
should not be null");
- Objects.requireNonNull(insertTabletRequest.getColumnTypes(), "column_types
should not be null");
+ Objects.requireNonNull(
+ insertTabletRequest.getColumnCatogories(), "column_catogories should
not be null");
Objects.requireNonNull(insertTabletRequest.getDataTypes(), "data_types
should not be null");
Objects.requireNonNull(insertTabletRequest.getTimestamps(), "timestamps
should not be null");
Objects.requireNonNull(insertTabletRequest.getValues(), "values should not
be null");
List<String> errorMessages = new ArrayList<>();
String table = insertTabletRequest.getTable();
- if (insertTabletRequest.getColumnTypes().size() == 0
- || insertTabletRequest.getColumnTypes().size()
+ if (insertTabletRequest.getColumnCatogories().size() == 0
+ || insertTabletRequest.getColumnCatogories().size()
!= insertTabletRequest.getColumnNames().size()) {
- errorMessages.add("column_names and column_types should have the same
size");
+ errorMessages.add("column_names and column_catogories should have the
same size");
}
- if (insertTabletRequest.getColumnTypes().size() !=
insertTabletRequest.getDataTypes().size()) {
- errorMessages.add("column_types and data_types should have the same
size");
+ if (insertTabletRequest.getColumnCatogories().size()
+ != insertTabletRequest.getDataTypes().size()) {
+ errorMessages.add("column_catogories and data_types should have the same
size");
}
if (insertTabletRequest.getTimestamps().size() !=
insertTabletRequest.getValues().size()) {
- errorMessages.add("values and data_types should have the same size");
+ errorMessages.add("values and timestamps should have the same size");
}
for (int i = 0; i < insertTabletRequest.getDataTypes().size(); i++) {
@@ -80,7 +82,9 @@ public class RequestValidationHandler {
List<Object> values = insertTabletRequest.getValues().get(i);
if (dataTypeSize != values.size()) {
errorMessages.add(
- "The number of values in the " + i + "th row is not equal to the
data_types size");
+ "The number of values in the "
+ + (i + 1)
+ + "th row is not equal to the data_types size");
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java
index a9b770915c5..c31f431dc3e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java
@@ -175,11 +175,11 @@ public class StatementConstructionHandler {
insertStatement.setAligned(false);
insertStatement.setWriteToTable(true);
TsTableColumnCategory[] columnCategories =
- new TsTableColumnCategory[insertTabletReq.getColumnTypes().size()];
+ new
TsTableColumnCategory[insertTabletReq.getColumnCatogories().size()];
for (int i = 0; i < columnCategories.length; i++) {
columnCategories[i] =
TsTableColumnCategory.fromTsFileColumnType(
-
Tablet.ColumnCategory.valueOf(insertTabletReq.getColumnTypes().get(i)));
+
Tablet.ColumnCategory.valueOf(insertTabletReq.getColumnCatogories().get(i)));
}
insertStatement.setColumnCategories(columnCategories);
diff --git a/iotdb-protocol/openapi/src/main/openapi3/iotdb_rest_table_v1.yaml
b/iotdb-protocol/openapi/src/main/openapi3/iotdb_rest_table_v1.yaml
index a02784d4cbf..205174afab9 100644
--- a/iotdb-protocol/openapi/src/main/openapi3/iotdb_rest_table_v1.yaml
+++ b/iotdb-protocol/openapi/src/main/openapi3/iotdb_rest_table_v1.yaml
@@ -112,7 +112,7 @@ components:
type: array
items:
type: string
- column_types:
+ column_catogories:
type: array
items:
type: string
