This is an automated email from the ASF dual-hosted git repository.
yuyuankang pushed a commit to branch kyy
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/kyy by this push:
new c219f66 format
c219f66 is described below
commit c219f668c16c9226abc34224816aa029aef679d5
Author: Ring-k <[email protected]>
AuthorDate: Mon Oct 12 22:35:42 2020 +0800
format
---
.../src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java | 3 +--
.../java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java | 3 +--
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 3 +--
.../org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java | 6 ++++--
server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 3 +--
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
index 5bb737b..4ece30c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
@@ -1098,8 +1098,7 @@ public class CMManager extends MManager {
public List<String> getNodeList(String path, int nodeLevel)
throws MetadataException {
return getNodesList(new PartialPath(path),
nodeLevel).stream().map(PartialPath::getFullPath)
- .collect(
- Collectors.toList());
+ .collect(Collectors.toList());
}
public Set<String> getChildNodePathInNextLevel(String path)
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
index d14a2fa..b294738 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
@@ -359,8 +359,7 @@ public class ClusterPlanExecutor extends PlanExecutor {
AsyncDataClient client = metaGroupMember
.getClientProvider().getAsyncDataClient(node,
RaftServer.getReadOperationTimeoutMS());
paths = SyncClientAdaptor
- .getNodeList(client, group.getHeader(),
schemaPattern.getFullPath(),
- level);
+ .getNodeList(client, group.getHeader(),
schemaPattern.getFullPath(), level);
} else {
SyncDataClient syncDataClient = metaGroupMember
.getClientProvider().getSyncDataClient(node,
RaftServer.getReadOperationTimeoutMS());
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 4422e24..8a8a211 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -1740,8 +1740,7 @@ public class MManager {
logger.warn("DataType mismatch, Insert measurement {} type {},
metadata tree type {}",
measurementList[i], insertDataType,
measurementMNode.getSchema().getType());
DataTypeMismatchException mismatchException = new
DataTypeMismatchException(
- measurementList[i],
- insertDataType, measurementMNode.getSchema().getType());
+ measurementList[i], insertDataType,
measurementMNode.getSchema().getType());
if (!config.isEnablePartialInsert()) {
throw mismatchException;
} else {
diff --git
a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
b/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
index a8ce003..88e2af9 100644
---
a/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
+++
b/server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
@@ -61,10 +61,12 @@ public class ShowTimeseriesDataSet extends QueryDataSet {
public boolean hasLimit;
private static Path[] resourcePaths = {new PartialPath(COLUMN_TIMESERIES,
false),
- new PartialPath(COLUMN_TIMESERIES_ALIAS, false), new
PartialPath(COLUMN_STORAGE_GROUP, false),
+ new PartialPath(COLUMN_TIMESERIES_ALIAS, false),
+ new PartialPath(COLUMN_STORAGE_GROUP, false),
new PartialPath(COLUMN_TIMESERIES_DATATYPE, false),
new PartialPath(COLUMN_TIMESERIES_ENCODING, false),
- new PartialPath(COLUMN_TIMESERIES_COMPRESSION, false), new
PartialPath(COLUMN_TAGS, false),
+ new PartialPath(COLUMN_TIMESERIES_COMPRESSION, false),
+ new PartialPath(COLUMN_TAGS, false),
new PartialPath(COLUMN_ATTRIBUTES, false)};
private static TSDataType[] resourceTypes = {TSDataType.TEXT,
TSDataType.TEXT, TSDataType.TEXT,
TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT,
TSDataType.TEXT};
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 982ae3e..92e3570 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -353,8 +353,7 @@ public class TSServiceImpl implements TSIService.Iface,
ServerContext {
case "ALL_COLUMNS":
resp.setColumnsList(
getPaths(new
PartialPath(req.getColumnPath())).stream().map(PartialPath::getFullPath)
- .collect(
- Collectors.toList()));
+ .collect(Collectors.toList()));
status = RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
break;
default:
