You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by li...@apache.org on 2019/01/25 03:23:25 UTC
[incubator-iotdb] branch fix_sonar updated: change columnSchema
name public to private
This is an automated email from the ASF dual-hosted git repository.
liurui pushed a commit to branch fix_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar by this push:
new 8e1dae1 change columnSchema name public to private
8e1dae1 is described below
commit 8e1dae1b5df0aab966c43284c0cde6b9e90e1ba9
Author: liuruiyiyang <24...@qq.com>
AuthorDate: Fri Jan 25 11:23:12 2019 +0800
change columnSchema name public to private
---
checkstyle.xml | 1 +
.../strategy/MinDirOccupiedSpaceFirstStrategy.java | 12 ++++++++----
.../MinFolderOccupiedSpaceFirstStrategy.java | 12 ++++++++----
.../iotdb/db/engine/filenode/FileNodeProcessor.java | 20 ++++++++++----------
.../iotdb/db/exception/builder/ExceptionBuilder.java | 2 +-
.../org/apache/iotdb/db/metadata/ColumnSchema.java | 6 +++++-
.../main/java/org/apache/iotdb/db/service/Utils.java | 12 ++++++------
.../org/apache/iotdb/db/utils/FileSchemaUtils.java | 10 +++++-----
.../memcontrol/BufferwriteFileSizeControlTest.java | 10 +++++-----
.../memcontrol/BufferwriteMetaSizeControlTest.java | 10 +++++-----
10 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index 5145a13..07ad0ba 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java
index 11f40be..7666fda 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java
@@ -25,11 +25,12 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.stream.Stream;
public class MinDirOccupiedSpaceFirstStrategy extends DirectoryStrategy {
// directory space is measured by MB
- private final long dataSizeShift = 1024 * 1024;
+ private static final long DATA_SIZE_SHIFT = 1024L * 1024;
@Override
public int nextFolderIndex() {
@@ -63,12 +64,15 @@ public class MinDirOccupiedSpaceFirstStrategy extends DirectoryStrategy {
Path folder = Paths.get(path);
long size = 0;
try {
- size = Files.walk(folder).filter(p -> p.toFile().isFile()).mapToLong(p -> p.toFile().length())
- .sum();
+ try (Stream<Path> stream = Files.walk(folder)) {
+ size = stream.filter(p -> p.toFile().isFile())
+ .mapToLong(p -> p.toFile().length())
+ .sum();
+ }
} catch (IOException e) {
LOGGER.error("Cannot calculate occupied space for seriesPath {}.", path);
}
- return size / dataSizeShift;
+ return size / DATA_SIZE_SHIFT;
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
index b4f1b26..1eb9438 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
@@ -25,11 +25,12 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.stream.Stream;
public class MinFolderOccupiedSpaceFirstStrategy extends DirectoryStrategy {
// directory space is measured by MB
- private final long dataSizeShift = 1024 * 1024;
+ private static final long DATA_SIZE_SHIFT = 1024L * 1024;
@Override
public int nextFolderIndex() {
@@ -63,12 +64,15 @@ public class MinFolderOccupiedSpaceFirstStrategy extends DirectoryStrategy {
Path folder = Paths.get(path);
long size = Long.MAX_VALUE;
try {
- size = Files.walk(folder).filter(p -> p.toFile().isFile()).mapToLong(p -> p.toFile().length())
- .sum();
+ try (Stream<Path> stream = Files.walk(folder)) {
+ size = stream.filter(p -> p.toFile().isFile())
+ .mapToLong(p -> p.toFile().length())
+ .sum();
+ }
} catch (IOException e) {
LOGGER.error("Cannot calculate occupied space for seriesPath {}.", path);
}
- return size / dataSizeShift;
+ return size / DATA_SIZE_SHIFT;
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index a5415b8..fdd1ff1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -875,12 +875,12 @@ public class FileNodeProcessor extends Processor implements IStatistic {
fileSchema.registerMeasurement(JsonConverter.convertJsonToMeasurementSchema(measurement));
}
- private JSONObject constrcutMeasurement(ColumnSchema col) {
+ private JSONObject constrcutMeasurement(ColumnSchema columnSchema) {
JSONObject measurement = new JSONObject();
- measurement.put(JsonFormatConstant.MEASUREMENT_UID, col.name);
- measurement.put(JsonFormatConstant.DATA_TYPE, col.dataType.toString());
- measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, col.encoding.toString());
- for (Entry<String, String> entry : col.getArgsMap().entrySet()) {
+ measurement.put(JsonFormatConstant.MEASUREMENT_UID, columnSchema.getName());
+ measurement.put(JsonFormatConstant.DATA_TYPE, columnSchema.dataType.toString());
+ measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, columnSchema.encoding.toString());
+ for (Entry<String, String> entry : columnSchema.getArgsMap().entrySet()) {
if (JsonFormatConstant.ENUM_VALUES.equals(entry.getKey())) {
String[] valueArray = entry.getValue().split(",");
measurement.put(JsonFormatConstant.ENUM_VALUES, new JSONArray(valueArray));
@@ -1725,12 +1725,12 @@ public class FileNodeProcessor extends Processor implements IStatistic {
throws WriteProcessException {
JSONArray rowGroup = new JSONArray();
- for (ColumnSchema col : schemaList) {
+ for (ColumnSchema columnSchema : schemaList) {
JSONObject measurement = new JSONObject();
- measurement.put(JsonFormatConstant.MEASUREMENT_UID, col.name);
- measurement.put(JsonFormatConstant.DATA_TYPE, col.dataType.toString());
- measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, col.encoding.toString());
- for (Entry<String, String> entry : col.getArgsMap().entrySet()) {
+ measurement.put(JsonFormatConstant.MEASUREMENT_UID, columnSchema.getName());
+ measurement.put(JsonFormatConstant.DATA_TYPE, columnSchema.dataType.toString());
+ measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, columnSchema.encoding.toString());
+ for (Entry<String, String> entry : columnSchema.getArgsMap().entrySet()) {
if (JsonFormatConstant.ENUM_VALUES.equals(entry.getKey())) {
String[] valueArray = entry.getValue().split(",");
measurement.put(JsonFormatConstant.ENUM_VALUES, new JSONArray(valueArray));
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java b/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java
index fc584f9..3f605aa 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/exception/builder/ExceptionBuilder.java
@@ -106,7 +106,7 @@ public class ExceptionBuilder {
File file = new File(url);
if (!file.exists()) {
- url.replace(CONFIG_NAME + language + FILE_SUFFIX, DEFAULT_FILEPATH);
+ url = url.replace(CONFIG_NAME + language + FILE_SUFFIX, DEFAULT_FILEPATH);
}
loadInfo(url);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
index 1f28e79..4232a08 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
@@ -28,7 +28,11 @@ public class ColumnSchema implements Serializable {
private static final long serialVersionUID = -8257474930341487207L;
- public String name;
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ private String name;
public TSDataType dataType;
public TSEncoding encoding;
private Map<String, String> args;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
index 0e8566c..a37008d 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/Utils.java
@@ -60,15 +60,15 @@ public class Utils {
return tsAllSchema;
}
- private static TSColumnSchema convertColumnSchema(ColumnSchema schema) {
- if (schema == null) {
+ private static TSColumnSchema convertColumnSchema(ColumnSchema columnSchema) {
+ if (columnSchema == null) {
return null;
}
TSColumnSchema tsColumnSchema = new TSColumnSchema();
- tsColumnSchema.setName(schema.name);
- tsColumnSchema.setDataType(schema.dataType == null ? null : schema.dataType.toString());
- tsColumnSchema.setEncoding(schema.encoding == null ? null : schema.encoding.toString());
- tsColumnSchema.setOtherArgs(schema.getArgsMap() == null ? null : schema.getArgsMap());
+ tsColumnSchema.setName(columnSchema.getName());
+ tsColumnSchema.setDataType(columnSchema.dataType == null ? null : columnSchema.dataType.toString());
+ tsColumnSchema.setEncoding(columnSchema.encoding == null ? null : columnSchema.encoding.toString());
+ tsColumnSchema.setOtherArgs(columnSchema.getArgsMap() == null ? null : columnSchema.getArgsMap());
return tsColumnSchema;
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
index 6db7dee..8c3a59f 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
@@ -66,12 +66,12 @@ public class FileSchemaUtils {
// TODO: is using a JSON as the media necessary?
JSONArray rowGroup = new JSONArray();
- for (ColumnSchema col : schemaList) {
+ for (ColumnSchema columnSchema : schemaList) {
JSONObject measurement = new JSONObject();
- measurement.put(JsonFormatConstant.MEASUREMENT_UID, col.name);
- measurement.put(JsonFormatConstant.DATA_TYPE, col.dataType.toString());
- measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, col.encoding.toString());
- for (Entry<String, String> entry : col.getArgsMap().entrySet()) {
+ measurement.put(JsonFormatConstant.MEASUREMENT_UID, columnSchema.getName());
+ measurement.put(JsonFormatConstant.DATA_TYPE, columnSchema.dataType.toString());
+ measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, columnSchema.encoding.toString());
+ for (Entry<String, String> entry : columnSchema.getArgsMap().entrySet()) {
if (JsonFormatConstant.ENUM_VALUES.equals(entry.getKey())) {
String[] valueArray = entry.getValue().split(",");
measurement.put(JsonFormatConstant.ENUM_VALUES, new JSONArray(valueArray));
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
index 7fa3f03..0d4ac60 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
@@ -188,12 +188,12 @@ public class BufferwriteFileSizeControlTest {
throws WriteProcessException {
JSONArray rowGroup = new JSONArray();
- for (ColumnSchema col : schemaList) {
+ for (ColumnSchema columnSchema : schemaList) {
JSONObject measurement = new JSONObject();
- measurement.put(JsonFormatConstant.MEASUREMENT_UID, col.name);
- measurement.put(JsonFormatConstant.DATA_TYPE, col.dataType.toString());
- measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, col.encoding.toString());
- for (Entry<String, String> entry : col.getArgsMap().entrySet()) {
+ measurement.put(JsonFormatConstant.MEASUREMENT_UID, columnSchema.getName());
+ measurement.put(JsonFormatConstant.DATA_TYPE, columnSchema.dataType.toString());
+ measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, columnSchema.encoding.toString());
+ for (Entry<String, String> entry : columnSchema.getArgsMap().entrySet()) {
if (JsonFormatConstant.ENUM_VALUES.equals(entry.getKey())) {
String[] valueArray = entry.getValue().split(",");
measurement.put(JsonFormatConstant.ENUM_VALUES, new JSONArray(valueArray));
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
index e58d723..a6991c0 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
@@ -188,12 +188,12 @@ public class BufferwriteMetaSizeControlTest {
throws WriteProcessException {
JSONArray rowGroup = new JSONArray();
- for (ColumnSchema col : schemaList) {
+ for (ColumnSchema columnSchema : schemaList) {
JSONObject measurement = new JSONObject();
- measurement.put(JsonFormatConstant.MEASUREMENT_UID, col.name);
- measurement.put(JsonFormatConstant.DATA_TYPE, col.dataType.toString());
- measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, col.encoding.toString());
- for (Entry<String, String> entry : col.getArgsMap().entrySet()) {
+ measurement.put(JsonFormatConstant.MEASUREMENT_UID, columnSchema.getName());
+ measurement.put(JsonFormatConstant.DATA_TYPE, columnSchema.dataType.toString());
+ measurement.put(JsonFormatConstant.MEASUREMENT_ENCODING, columnSchema.encoding.toString());
+ for (Entry<String, String> entry : columnSchema.getArgsMap().entrySet()) {
if (JsonFormatConstant.ENUM_VALUES.equals(entry.getKey())) {
String[] valueArray = entry.getValue().split(",");
measurement.put(JsonFormatConstant.ENUM_VALUES, new JSONArray(valueArray));