You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by jf...@apache.org on 2020/06/12 11:50:09 UTC
[incubator-iotdb] branch feature/IOTDB-742-structured-logical-types
updated: Improved toString for the StructuredTypes.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch feature/IOTDB-742-structured-logical-types
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature/IOTDB-742-structured-logical-types by this push:
new a4cb160 Improved toString for the StructuredTypes.
a4cb160 is described below
commit a4cb160b357ff32bbbfe040e8df31756dd9e4285
Author: julian <j....@pragmaticminds.de>
AuthorDate: Fri Jun 12 13:49:52 2020 +0200
Improved toString for the StructuredTypes.
---
.../java/org/apache/iotdb/db/metadata/structured/ArrayType.java | 4 ++++
.../main/java/org/apache/iotdb/db/metadata/structured/MapType.java | 6 +++---
.../java/org/apache/iotdb/db/metadata/structured/PrimitiveType.java | 6 +-----
.../org/apache/iotdb/db/integration/IoTDBInsertStructuredIT.java | 5 ++++-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/structured/ArrayType.java b/server/src/main/java/org/apache/iotdb/db/metadata/structured/ArrayType.java
index 759c9dd..e4a0e4d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/structured/ArrayType.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/structured/ArrayType.java
@@ -63,4 +63,8 @@ public class ArrayType implements StructuredType {
throw new UnsupportedOperationException();
}
+ @Override
+ public String toString() {
+ return arrayType.toString() + "[]";
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/structured/MapType.java b/server/src/main/java/org/apache/iotdb/db/metadata/structured/MapType.java
index a1aa092..7d219a1 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/structured/MapType.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/structured/MapType.java
@@ -86,11 +86,11 @@ public class MapType implements StructuredType {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
- builder.append("{\n");
+ builder.append("{");
for (Map.Entry<String, StructuredType> entry : this.children.entrySet()) {
- builder.append("\"" + entry.getKey() + "\": " + entry.getValue().toString() + ",\n");
+ builder.append("\"" + entry.getKey() + "\": " + entry.getValue().toString() + ",");
}
- builder.append("}\n");
+ builder.append("}");
return builder.toString();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/structured/PrimitiveType.java b/server/src/main/java/org/apache/iotdb/db/metadata/structured/PrimitiveType.java
index c069728..0bed54c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/structured/PrimitiveType.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/structured/PrimitiveType.java
@@ -85,10 +85,6 @@ public class PrimitiveType implements StructuredType {
@Override
public String toString() {
- return "PrimitiveType{" +
- "type=" + type +
- ", encoding=" + encoding +
- ", compression=" + compression +
- '}';
+ return type.toString();
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBInsertStructuredIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBInsertStructuredIT.java
index 9d69a38..467ed24 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBInsertStructuredIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBInsertStructuredIT.java
@@ -192,7 +192,10 @@ public class IoTDBInsertStructuredIT implements WithAssertions {
carMap.put("look", new MapType(lookMap));
carMap.put("drivers", new ArrayType(new PrimitiveType(TSDataType.TEXT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED)));
- SManager.getInstance().register("car", new MapType(carMap));
+ MapType carType = new MapType(carMap);
+ System.out.println("Using Type: " + carType);
+
+ SManager.getInstance().register("car", carType);
// Insert value
statement.execute("INSERT INTO root.sg1.d1 (timestamp, coordinates) VALUES (NOW(), \"{\\\"max_speed\\\": 160.0, \\\"look\\\":{\\\"clean\\\":true, \\\"color\\\": \\\"blue\\\"}, \\\"drivers\\\":[\\\"julian\\\", \\\"xiangdong\\\"]}::car\")");