You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/02/21 06:41:07 UTC
[iotdb] branch master updated: [IOTDB-1166] Remove redundant
toString() calls (#2704)
This is an automated email from the ASF dual-hosted git repository.
hxd 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 5a14711 [IOTDB-1166] Remove redundant toString() calls (#2704)
5a14711 is described below
commit 5a1471118af9c4fcf8e4048e7c53eedc8c11bed0
Author: Jincheng Sun <su...@gmail.com>
AuthorDate: Sun Feb 21 14:40:49 2021 +0800
[IOTDB-1166] Remove redundant toString() calls (#2704)
---
.../main/java/org/apache/iotdb/cluster/ClientMain.java | 2 +-
.../apache/iotdb/cluster/coordinator/Coordinator.java | 9 +++------
.../iotdb/cluster/log/logtypes/PhysicalPlanLog.java | 2 +-
.../iotdb/cluster/server/StoppedMemberManager.java | 2 +-
.../org/apache/iotdb/cluster/server/monitor/Timer.java | 2 +-
.../iotdb/cluster/utils/nodetool/function/Host.java | 2 +-
.../src/main/java/org/apache/iotdb/SessionExample.java | 2 +-
.../main/java/org/apache/iotdb/SessionPoolExample.java | 2 +-
.../org/apache/iotdb/hadoop/fileSystem/HDFSFile.java | 16 ++++++++--------
.../java/org/apache/iotdb/hive/TsFileDeserializer.java | 2 +-
.../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 2 +-
.../iotdb/db/engine/merge/manage/MergeManager.java | 4 ++--
.../modification/io/LocalTextModificationAccessor.java | 2 +-
.../db/exception/query/UnSupportedFillTypeException.java | 2 +-
.../main/java/org/apache/iotdb/db/metadata/MManager.java | 4 ++--
.../java/org/apache/iotdb/db/metrics/ui/MetricsPage.java | 2 +-
.../org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java | 2 +-
.../apache/iotdb/db/qp/physical/sys/DataAuthPlan.java | 2 +-
.../org/apache/iotdb/db/qp/physical/sys/ShowPlan.java | 2 +-
.../UDFInputSeriesDataTypeNotValidException.java | 4 ++--
.../iotdb/db/query/udf/core/executor/UDTFExecutor.java | 2 +-
.../query/udf/service/TemporaryQueryDataFileService.java | 7 ++-----
.../db/query/udf/service/UDFRegistrationService.java | 9 ++++-----
.../java/org/apache/iotdb/db/service/TSServiceImpl.java | 5 ++---
.../java/org/apache/iotdb/db/tools/TsFileSketchTool.java | 6 ++----
.../main/java/org/apache/iotdb/db/utils/AuthUtils.java | 2 +-
.../apache/iotdb/db/utils/EncodingInferenceUtils.java | 2 +-
.../main/java/org/apache/iotdb/db/utils/SchemaUtils.java | 4 +---
.../java/org/apache/iotdb/db/constant/TestConstant.java | 3 +--
.../iotdb/db/integration/IoTDBFlushQueryMergeIT.java | 6 +++---
.../org/apache/iotdb/db/integration/IoTDBMergeTest.java | 2 +-
.../read/expression/impl/GlobalTimeExpression.java | 2 +-
.../read/query/dataset/DataSetWithoutTimeGenerator.java | 2 +-
.../java/org/apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../java/org/apache/iotdb/tsfile/write/WriteTest.java | 2 +-
35 files changed, 55 insertions(+), 68 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java b/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
index 2da0891..cabdd8c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
@@ -461,7 +461,7 @@ public class ClientMain {
for (int i = 0; i < colNum; i++) {
stringBuilder.append(set.getString(i + 1)).append(",");
}
- System.out.println(stringBuilder.toString());
+ System.out.println(stringBuilder);
}
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
index e284420..0ad14f4 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java
@@ -266,8 +266,7 @@ public class Coordinator {
} else {
status =
StatusUtils.getStatus(
- StatusUtils.EXECUTE_STATEMENT_ERROR,
- MSG_MULTIPLE_ERROR + errorCodePartitionGroups.toString());
+ StatusUtils.EXECUTE_STATEMENT_ERROR, MSG_MULTIPLE_ERROR + errorCodePartitionGroups);
}
logger.debug("{}: executed {} with answer {}", name, plan, status);
return status;
@@ -420,8 +419,7 @@ public class Coordinator {
} else {
status =
StatusUtils.getStatus(
- StatusUtils.EXECUTE_STATEMENT_ERROR,
- MSG_MULTIPLE_ERROR + errorCodePartitionGroups.toString());
+ StatusUtils.EXECUTE_STATEMENT_ERROR, MSG_MULTIPLE_ERROR + errorCodePartitionGroups);
}
return status;
}
@@ -572,8 +570,7 @@ public class Coordinator {
} else {
status =
StatusUtils.getStatus(
- StatusUtils.EXECUTE_STATEMENT_ERROR,
- MSG_MULTIPLE_ERROR + errorCodePartitionGroups.toString());
+ StatusUtils.EXECUTE_STATEMENT_ERROR, MSG_MULTIPLE_ERROR + errorCodePartitionGroups);
}
return status;
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/logtypes/PhysicalPlanLog.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/logtypes/PhysicalPlanLog.java
index eb4a19d..ad24794 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/logtypes/PhysicalPlanLog.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/logtypes/PhysicalPlanLog.java
@@ -90,7 +90,7 @@ public class PhysicalPlanLog extends Log {
@Override
public String toString() {
- return plan.toString() + ",term:" + getCurrLogTerm() + ",index:" + getCurrLogIndex();
+ return plan + ",term:" + getCurrLogTerm() + ",index:" + getCurrLogIndex();
}
@Override
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
index 35e541d..287f411 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
@@ -95,7 +95,7 @@ public class StoppedMemberManager {
public synchronized void remove(Node header) {
removedMemberMap.remove(header);
try (BufferedWriter writer = new BufferedWriter(new FileWriter(stoppedMembersFileName, true))) {
- writer.write(RESUMED + ";" + header.toString());
+ writer.write(RESUMED + ";" + header);
writer.newLine();
} catch (IOException e) {
logger.error("Cannot record resumed member of header {}", header, e);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/monitor/Timer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/monitor/Timer.java
index 33c3e4f..f4ac980 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/monitor/Timer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/monitor/Timer.java
@@ -322,7 +322,7 @@ public class Timer {
private static void printTo(Statistic currNode, StringBuilder out) {
if (currNode != Statistic.ROOT && currNode.valid) {
indent(out, currNode.level);
- out.append(currNode.toString()).append("\n");
+ out.append(currNode).append("\n");
}
for (Statistic child : currNode.children) {
printTo(child, out);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Host.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Host.java
index 2753e1d..c601fff 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Host.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Host.java
@@ -71,7 +71,7 @@ public class Host extends NodeToolCmd {
builder.append(", ").append(nodeToString(raftGroup.get(i)));
}
builder.append(')');
- msgPrintln(String.format("%-50s->%20s", builder.toString(), slotNum));
+ msgPrintln(String.format("%-50s->%20s", builder, slotNum));
}
}
}
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 9d30149..20387de 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -515,7 +515,7 @@ public class SessionExample {
builder.append("null");
}
- System.out.println(builder.toString());
+ System.out.println(builder);
}
dataSet.closeOperationHandle();
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
index 936a2e6..d2e4977 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
@@ -107,7 +107,7 @@ public class SessionPoolExample {
for (String columnName : wrapper.getColumnNames()) {
builder.append(dataIterator.getString(columnName) + " ");
}
- System.out.println(builder.toString());
+ System.out.println(builder);
}
} catch (IoTDBConnectionException | StatementExecutionException e) {
e.printStackTrace();
diff --git a/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
index 3e4b244..956c939 100644
--- a/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
+++ b/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
@@ -99,7 +99,7 @@ public class HDFSFile extends File {
try {
return fs.getFileStatus(hdfsPath).getLen();
} catch (IOException e) {
- logger.error("Fail to get length of the file {}, ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to get length of the file {}, ", hdfsPath.toUri(), e);
return 0;
}
}
@@ -109,7 +109,7 @@ public class HDFSFile extends File {
try {
return fs.exists(hdfsPath);
} catch (IOException e) {
- logger.error("Fail to check whether the file {} exists. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to check whether the file {} exists. ", hdfsPath.toUri(), e);
return false;
}
}
@@ -124,7 +124,7 @@ public class HDFSFile extends File {
}
return files.toArray(new HDFSFile[0]);
} catch (IOException e) {
- logger.error("Fail to list files in {}. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to list files in {}. ", hdfsPath.toUri(), e);
return null;
}
}
@@ -144,7 +144,7 @@ public class HDFSFile extends File {
try {
return !fs.exists(hdfsPath) || fs.delete(hdfsPath, true);
} catch (IOException e) {
- logger.error("Fail to delete file {}. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to delete file {}. ", hdfsPath.toUri(), e);
return false;
}
}
@@ -154,7 +154,7 @@ public class HDFSFile extends File {
try {
return !exists() && fs.mkdirs(hdfsPath);
} catch (IOException e) {
- logger.error("Fail to create directory {}. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to create directory {}. ", hdfsPath.toUri(), e);
return false;
}
}
@@ -164,7 +164,7 @@ public class HDFSFile extends File {
try {
return exists() && fs.getFileStatus(hdfsPath).isDirectory();
} catch (IOException e) {
- logger.error("Fail to judge whether {} is a directory. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to judge whether {} is a directory. ", hdfsPath.toUri(), e);
return false;
}
}
@@ -174,7 +174,7 @@ public class HDFSFile extends File {
try {
return fs.getStatus().getRemaining();
} catch (IOException e) {
- logger.error("Fail to get free space of {}. ", hdfsPath.toUri().toString(), e);
+ logger.error("Fail to get free space of {}. ", hdfsPath.toUri(), e);
return 0L;
}
}
@@ -214,7 +214,7 @@ public class HDFSFile extends File {
try {
return fs.rename(hdfsPath, new Path(dest.getAbsolutePath()));
} catch (IOException e) {
- logger.error("Failed to rename file {} to {}. ", hdfsPath.toString(), dest.getName(), e);
+ logger.error("Failed to rename file {} to {}. ", hdfsPath, dest.getName(), e);
return false;
}
}
diff --git a/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileDeserializer.java b/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileDeserializer.java
index 1d794b4..0e81ced 100644
--- a/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileDeserializer.java
+++ b/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileDeserializer.java
@@ -68,7 +68,7 @@ public class TsFileDeserializer {
return null;
}
- LOG.debug("device_id: {}", mapWritable.get(new Text("device_id")).toString());
+ LOG.debug("device_id: {}", mapWritable.get(new Text("device_id")));
LOG.debug("time_stamp: {}", mapWritable.get(new Text("time_stamp")));
for (int i = 0; i < columnNames.size(); i++) {
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizer.java b/server/src/main/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizer.java
index 2563f05..8af185c 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizer.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizer.java
@@ -77,7 +77,7 @@ public class OpenIdAuthorizer extends BasicAuthorizer {
try {
providerKey = RSAKey.parse(jwk).toRSAPublicKey();
} catch (java.text.ParseException | JOSEException e) {
- throw new AuthException("Unable to get OIDC Provider Key from JWK " + jwk.toString(), e);
+ throw new AuthException("Unable to get OIDC Provider Key from JWK " + jwk, e);
}
logger.info("Initialized with providerKey: {}", providerKey);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
index 858a435..f9112e1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
@@ -337,7 +337,7 @@ public class MergeManager implements IService, MergeManagerMBean {
.append(storageGroup)
.append(System.lineSeparator());
for (TaskStatus status : statusList) {
- builder.append("\t\t").append(status.toString()).append(System.lineSeparator());
+ builder.append("\t\t").append(status).append(System.lineSeparator());
}
}
@@ -351,7 +351,7 @@ public class MergeManager implements IService, MergeManagerMBean {
.append(storageGroup)
.append(System.lineSeparator());
for (TaskStatus status : statusList) {
- builder.append("\t\t").append(status.toString()).append(System.lineSeparator());
+ builder.append("\t\t").append(status).append(System.lineSeparator());
}
}
return builder.toString();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java b/server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
index 2c1a7fc..6160341 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
@@ -127,7 +127,7 @@ public class LocalTextModificationAccessor
}
private static String encodeDeletion(Deletion del) {
- return del.getType().toString()
+ return del.getType()
+ SEPARATOR
+ del.getPathString()
+ SEPARATOR
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
index b320e91..95f2fc9 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
@@ -27,7 +27,7 @@ public class UnSupportedFillTypeException extends QueryProcessException {
public UnSupportedFillTypeException(TSDataType dataType) {
super(
- String.format("Unsupported linear fill data type: [%s]", dataType.toString()),
+ String.format("Unsupported linear fill data type: [%s]", dataType),
TSStatusCode.UNSUPPORTED_FILL_TYPE_ERROR.getStatusCode());
}
}
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 7926ef2..6c7e5de 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
@@ -278,7 +278,7 @@ public class MManager {
"spend {} ms to deserialize mtree from mlog.bin", System.currentTimeMillis() - time);
return idx;
} catch (Exception e) {
- throw new IOException("Failed to parser mlog.bin for err:" + e.toString());
+ throw new IOException("Failed to parser mlog.bin for err:" + e);
}
} else {
return 0;
@@ -1117,7 +1117,7 @@ public class MManager {
/** Get metadata in string */
public String getMetadataInString() {
- return TIME_SERIES_TREE_HEADER + mtree.toString();
+ return TIME_SERIES_TREE_HEADER + mtree;
}
public void setTTL(PartialPath storageGroup, long dataTTL) throws MetadataException, IOException {
diff --git a/server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java b/server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java
index 6c567c4..0cf87c7 100644
--- a/server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java
+++ b/server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java
@@ -175,7 +175,7 @@ public class MetricsPage {
+ sqlArgument.getPlan().getOperatorType()
+ "</br>===========================</br>"
+ "Path: "
- + sqlArgument.getPlan().getPaths().toString()
+ + sqlArgument.getPlan().getPaths()
+ "</pre>"
+ "</div>"
+ "</td>"
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
index e823c50..26c7d8a 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
@@ -415,7 +415,7 @@ public class AuthorPlan extends PhysicalPlan {
type = PhysicalPlanType.DELETE_USER.ordinal();
break;
default:
- throw new IllegalArgumentException("Unknown operator: " + operatorType.toString());
+ throw new IllegalArgumentException("Unknown operator: " + operatorType);
}
return type;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java
index efd12c1..d52b53c 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java
@@ -93,7 +93,7 @@ public class DataAuthPlan extends PhysicalPlan {
} else if (operatorType == OperatorType.REVOKE_WATERMARK_EMBEDDING) {
type = PhysicalPlanType.REVOKE_WATERMARK_EMBEDDING.ordinal();
} else {
- throw new IllegalArgumentException("Unknown operator: " + operatorType.toString());
+ throw new IllegalArgumentException("Unknown operator: " + operatorType);
}
return type;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java
index 2655312..6c6d4c8 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/ShowPlan.java
@@ -97,7 +97,7 @@ public class ShowPlan extends PhysicalPlan {
@Override
public String toString() {
- return String.format("%s %s", getOperatorType().toString(), showContentType);
+ return String.format("%s %s", getOperatorType(), showContentType);
}
public enum ShowContentType {
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/api/exception/UDFInputSeriesDataTypeNotValidException.java b/server/src/main/java/org/apache/iotdb/db/query/udf/api/exception/UDFInputSeriesDataTypeNotValidException.java
index 7a346a1..7bcd9bc 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/api/exception/UDFInputSeriesDataTypeNotValidException.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/api/exception/UDFInputSeriesDataTypeNotValidException.java
@@ -30,7 +30,7 @@ public class UDFInputSeriesDataTypeNotValidException extends UDFParameterNotVali
super(
String.format(
"the data type of the input series (index: %d) is not valid. expected: %s. actual: %s.",
- index, expected.toString(), actual.toString()));
+ index, expected, actual));
}
public UDFInputSeriesDataTypeNotValidException(
@@ -38,6 +38,6 @@ public class UDFInputSeriesDataTypeNotValidException extends UDFParameterNotVali
super(
String.format(
"the data type of the input series (index: %d) is not valid. expected: %s. actual: %s.",
- index, Arrays.toString(expected), actual.toString()));
+ index, Arrays.toString(expected), actual));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
index 0179cf1..9d69582 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/executor/UDTFExecutor.java
@@ -100,7 +100,7 @@ public class UDTFExecutor {
throw new QueryProcessException(
String.format(
"Error occurred during executing UDTF#%s: %s", methodName, System.lineSeparator())
- + e.toString());
+ + e);
}
public UDFContext getContext() {
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/service/TemporaryQueryDataFileService.java b/server/src/main/java/org/apache/iotdb/db/query/udf/service/TemporaryQueryDataFileService.java
index 20ec287..0c59d8e 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/service/TemporaryQueryDataFileService.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/service/TemporaryQueryDataFileService.java
@@ -79,17 +79,14 @@ public class TemporaryQueryDataFileService implements IService {
recorder.closeFile();
} catch (IOException e) {
logger.warn(
- String.format(
- "Failed to close file in method deregister(%d), because %s",
- queryId, e.toString()));
+ String.format("Failed to close file in method deregister(%d), because %s", queryId, e));
}
}
try {
FileUtils.cleanDirectory(SystemFileFactory.INSTANCE.getFile(getDirName(queryId)));
} catch (IOException e) {
logger.warn(
- String.format(
- "Failed to clean dir in method deregister(%d), because %s", queryId, e.toString()));
+ String.format("Failed to clean dir in method deregister(%d), because %s", queryId, e));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/service/UDFRegistrationService.java b/server/src/main/java/org/apache/iotdb/db/query/udf/service/UDFRegistrationService.java
index 521cbbd..88ceaba 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/service/UDFRegistrationService.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/service/UDFRegistrationService.java
@@ -164,7 +164,7 @@ public class UDFRegistrationService implements IService {
String errorMessage =
String.format(
"Failed to register UDF %s(%s), because its instance can not be constructed successfully. Exception: %s",
- functionName, className, e.toString());
+ functionName, className, e);
logger.warn(errorMessage);
throw new UDFRegistrationException(errorMessage);
} finally {
@@ -186,7 +186,7 @@ public class UDFRegistrationService implements IService {
String errorMessage =
String.format(
"Failed to append UDF log when registering UDF %s(%s), because %s",
- functionName, className, e.toString());
+ functionName, className, e);
logger.error(errorMessage);
throw new UDFRegistrationException(errorMessage, e);
}
@@ -224,8 +224,7 @@ public class UDFRegistrationService implements IService {
registrationInformation.put(functionName, information);
String errorMessage =
String.format(
- "Failed to append UDF log when deregistering UDF %s, because %s",
- functionName, e.toString());
+ "Failed to append UDF log when deregistering UDF %s, because %s", functionName, e);
logger.error(errorMessage);
throw new UDFRegistrationException(errorMessage, e);
}
@@ -276,7 +275,7 @@ public class UDFRegistrationService implements IService {
String errorMessage =
String.format(
"Failed to reflect UDF %s(%s) instance, because %s",
- functionName, information.getClassName(), e.toString());
+ functionName, information.getClassName(), e);
logger.warn(errorMessage);
throw new QueryProcessException(errorMessage);
}
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 5be8485..056109c 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
@@ -771,8 +771,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
Map<String, AggregateResult> finalPaths =
FilePathUtils.getPathByLevel((AggregationPlan) plan, pathIndex);
for (Map.Entry<String, AggregateResult> entry : finalPaths.entrySet()) {
- respColumns.add(
- entry.getValue().getAggregationType().toString() + "(" + entry.getKey() + ")");
+ respColumns.add(entry.getValue().getAggregationType() + "(" + entry.getKey() + ")");
columnsTypes.add(entry.getValue().getResultDataType().toString());
}
} else {
@@ -1658,7 +1657,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
if (!checkAuthorization(paths, plan, sessionIdUsernameMap.get(sessionId))) {
return RpcUtils.getStatus(
TSStatusCode.NO_PERMISSION_ERROR,
- "No permissions for this operation " + plan.getOperatorType().toString());
+ "No permissions for this operation " + plan.getOperatorType());
}
} catch (AuthException e) {
LOGGER.warn("meet error while checking authorization.", e);
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
index 6afdff6..b8b42eb 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSketchTool.java
@@ -83,7 +83,7 @@ public class TsFileSketchTool {
for (ChunkGroupMetadata chunkGroupMetadata : allChunkGroupMetadata) {
printlnBoth(
pw,
- str1.toString()
+ str1
+ "\t[Chunk Group] of "
+ chunkGroupMetadata.getDevice()
+ ", num of Chunks:"
@@ -124,9 +124,7 @@ public class TsFileSketchTool {
- 1;
}
- printlnBoth(
- pw,
- str1.toString() + "\t[Chunk Group] of " + chunkGroupMetadata.getDevice() + " ends");
+ printlnBoth(pw, str1 + "\t[Chunk Group] of " + chunkGroupMetadata.getDevice() + " ends");
}
// metadata begins
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
index d413a58..2c20a7d 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
@@ -133,7 +133,7 @@ public class AuthUtils {
return;
default:
throw new AuthException(
- String.format("Illegal privilege %s on seriesPath %s", type.toString(), path));
+ String.format("Illegal privilege %s on seriesPath %s", type, path));
}
} else {
switch (type) {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
index 05a648a..745c4a7 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
@@ -48,7 +48,7 @@ public class EncodingInferenceUtils {
return conf.getDefaultTextEncoding();
default:
throw new UnSupportedDataTypeException(
- String.format("Data type %s is not supported.", dataType.toString()));
+ String.format("Data type %s is not supported.", dataType));
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
index dadc0c0..a9b1934 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
@@ -238,9 +238,7 @@ public class SchemaUtils {
throws MetadataException {
if (!schemaChecker.get(dataType).contains(encoding)) {
throw new MetadataException(
- String.format(
- "encoding %s does not support %s", encoding.toString(), dataType.toString()),
- true);
+ String.format("encoding %s does not support %s", encoding, dataType), true);
}
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/constant/TestConstant.java b/server/src/test/java/org/apache/iotdb/db/constant/TestConstant.java
index f3430e6..511b83e 100644
--- a/server/src/test/java/org/apache/iotdb/db/constant/TestConstant.java
+++ b/server/src/test/java/org/apache/iotdb/db/constant/TestConstant.java
@@ -101,7 +101,6 @@ public class TestConstant {
measurements.append(",").append(dataPoint.getMeasurementId());
values.append(",").append(dataPoint.getValue());
}
- return String.format(
- insertTemplate, record.deviceId, measurements.toString(), record.time, values);
+ return String.format(insertTemplate, record.deviceId, measurements, record.time, values);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeIT.java
index 96c288f..a936774 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeIT.java
@@ -129,14 +129,14 @@ public class IoTDBFlushQueryMergeIT {
for (int i = 1; i <= 3; i++) {
for (int j = 10; j < 20; j++) {
- statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, String.valueOf(j)));
+ statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, j));
}
}
statement.execute("FLUSH");
for (int i = 1; i <= 3; i++) {
for (int j = 0; j < 10; j++) {
- statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, String.valueOf(j)));
+ statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, j));
}
}
statement.execute("FLUSH root.group1");
@@ -144,7 +144,7 @@ public class IoTDBFlushQueryMergeIT {
for (int i = 1; i <= 3; i++) {
for (int j = 0; j < 30; j++) {
- statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, String.valueOf(j)));
+ statement.execute(String.format(insertTemplate, i, j, j, j * 0.1, j));
}
}
statement.execute("FLUSH root.group1 TRUE");
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
index b6104de..a3c23a2 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
@@ -374,7 +374,7 @@ public class IoTDBMergeTest {
for (int i = 0; i < colNum; i++) {
stringBuilder.append(resultSet.getString(i + 1)).append(",");
}
- System.out.println(stringBuilder.toString());
+ System.out.println(stringBuilder);
cnt++;
}
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java
index ac4c5c4..3c07c06 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/impl/GlobalTimeExpression.java
@@ -56,6 +56,6 @@ public class GlobalTimeExpression implements IUnaryExpression, Serializable {
@Override
public String toString() {
- return "[" + this.filter.toString() + "]";
+ return "[" + this.filter + "]";
}
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java
index 0a36640..85d17a2 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/DataSetWithoutTimeGenerator.java
@@ -173,7 +173,7 @@ public class DataSetWithoutTimeGenerator extends QueryDataSet {
field.setBinaryV(col.getBinary());
break;
default:
- throw new UnSupportedDataTypeException("UnSupported" + String.valueOf(col.getDataType()));
+ throw new UnSupportedDataTypeException("UnSupported" + col.getDataType());
}
}
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
index 9beb73a..8ce3f01 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
@@ -161,7 +161,7 @@ public class TsFileWriter implements AutoCloseable {
public void registerTimeseries(Path path, MeasurementSchema measurementSchema)
throws WriteProcessException {
if (schema.containsTimeseries(path)) {
- throw new WriteProcessException("given timeseries has exists! " + path.toString());
+ throw new WriteProcessException("given timeseries has exists! " + path);
}
schema.registerTimeseries(path, measurementSchema);
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
index ce75944..637f1b4 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
@@ -250,7 +250,7 @@ public class WriteTest {
try {
tsFileWriter.registerTimeseries(path, dupTimeseries);
} catch (WriteProcessException e) {
- assertEquals("given timeseries has exists! " + path.toString(), e.getMessage());
+ assertEquals("given timeseries has exists! " + path, e.getMessage());
}
try {
tsFileWriter.close();