This is an automated email from the ASF dual-hosted git repository.
jackietien 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 1056a23 [IOTDB-2005] use braces with if, else, for, do and while
statements (#4378)
1056a23 is described below
commit 1056a23ea83e86c90ee4d862e3f804fe69bcf4d3
Author: Qian.Sun <[email protected]>
AuthorDate: Sun Nov 14 15:44:03 2021 +0800
[IOTDB-2005] use braces with if, else, for, do and while statements (#4378)
---
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 18 ++++--
.../iotdb/cluster/log/applier/BaseApplier.java | 8 ++-
.../query/reader/mult/RemoteMultSeriesReader.java | 8 ++-
.../org/apache/iotdb/hive/TSFHiveRecordWriter.java | 3 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 4 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 15 +++--
.../java/org/apache/iotdb/jdbc/StringUtils.java | 19 ++++--
.../iotdb/db/engine/memtable/WritableMemChunk.java | 8 ++-
.../io/LocalTextModificationAccessor.java | 4 +-
.../modification/utils/TracedBufferedReader.java | 71 ++++++++++++++++------
.../db/engine/storagegroup/TsFileResource.java | 4 +-
.../iotdb/db/metadata/template/Template.java | 4 +-
.../db/metadata/template/TemplateManager.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 ++-
.../iotdb/db/qp/logical/crud/LikeOperator.java | 12 +++-
.../iotdb/db/qp/logical/crud/RegexpOperator.java | 12 +++-
.../db/tools/settle/TsFileAndModSettleTool.java | 4 +-
.../iotdb/session/template/InternalNode.java | 7 ++-
.../iotdb/tsfile/read/filter/GroupByFilter.java | 20 +++---
.../iotdb/tsfile/read/filter/operator/Like.java | 8 ++-
.../apache/iotdb/tsfile/utils/FilePathUtils.java | 4 +-
.../apache/iotdb/tsfile/utils/StringContainer.java | 8 ++-
22 files changed, 184 insertions(+), 68 deletions(-)
diff --git a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
index c826c03..1043036 100644
--- a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
+++ b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
@@ -541,7 +541,9 @@ public class ImportCsv extends AbstractCsvTool {
String regex = "(?<=\\()\\S+(?=\\))";
Pattern pattern = Pattern.compile(regex);
for (String headerName : headerNames) {
- if (headerName.equals("Time") || headerName.equals("Device")) continue;
+ if (headerName.equals("Time") || headerName.equals("Device")) {
+ continue;
+ }
Matcher matcher = pattern.matcher(headerName);
String type;
if (matcher.find()) {
@@ -652,9 +654,11 @@ public class ImportCsv extends AbstractCsvTool {
* @return
*/
private static TSDataType typeInfer(String value) {
- if (value.contains("\"")) return TEXT;
- else if (value.equals("true") || value.equals("false")) return BOOLEAN;
- else if (!value.contains(".")) {
+ if (value.contains("\"")) {
+ return TEXT;
+ } else if (value.equals("true") || value.equals("false")) {
+ return BOOLEAN;
+ } else if (!value.contains(".")) {
try {
Integer.valueOf(value);
return INT32;
@@ -667,9 +671,11 @@ public class ImportCsv extends AbstractCsvTool {
}
}
} else {
- if (Float.valueOf(value).toString().length() ==
Double.valueOf(value).toString().length())
+ if (Float.valueOf(value).toString().length() ==
Double.valueOf(value).toString().length()) {
return FLOAT;
- else return DOUBLE;
+ } else {
+ return DOUBLE;
+ }
}
}
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/BaseApplier.java
b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/BaseApplier.java
index cf99c8f..3adc36d 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/BaseApplier.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/BaseApplier.java
@@ -219,8 +219,12 @@ abstract class BaseApplier implements LogApplier {
pullTimeseriesSchema(plan, dataGroupMember.getHeader());
plan.recoverFromFailure();
getQueryExecutor().processNonQuery(plan);
- } else throw e;
- } else throw e;
+ } else {
+ throw e;
+ }
+ } else {
+ throw e;
+ }
}
}
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReader.java
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReader.java
index 1314341..2b5282c 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReader.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/mult/RemoteMultSeriesReader.java
@@ -129,7 +129,9 @@ public class RemoteMultSeriesReader extends
AbstractMultPointReader {
return;
}
List<String> paths = batchStrategy.selectBatchPaths(this.cachedBatchs);
- if (paths.isEmpty()) return;
+ if (paths.isEmpty()) {
+ return;
+ }
Map<String, ByteBuffer> result;
if (ClusterDescriptor.getInstance().getConfig().isUseAsyncServer()) {
@@ -138,7 +140,9 @@ public class RemoteMultSeriesReader extends
AbstractMultPointReader {
result = fetchResultSync(paths);
}
- if (result == null) return;
+ if (result == null) {
+ return;
+ }
for (String path : result.keySet()) {
diff --git
a/hive-connector/src/main/java/org/apache/iotdb/hive/TSFHiveRecordWriter.java
b/hive-connector/src/main/java/org/apache/iotdb/hive/TSFHiveRecordWriter.java
index b2b6457..f261448 100644
---
a/hive-connector/src/main/java/org/apache/iotdb/hive/TSFHiveRecordWriter.java
+++
b/hive-connector/src/main/java/org/apache/iotdb/hive/TSFHiveRecordWriter.java
@@ -52,10 +52,11 @@ public class TSFHiveRecordWriter implements
FileSinkOperator.RecordWriter {
@Override
public void write(Writable writable) throws IOException {
- if (!(writable instanceof HDFSTSRecord))
+ if (!(writable instanceof HDFSTSRecord)) {
throw new IOException(
"Expecting instance of HDFSTSRecord, but received"
+ writable.getClass().getCanonicalName());
+ }
try {
writer.write(((HDFSTSRecord) writable).convertToTSRecord());
} catch (WriteProcessException e) {
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
index 14c4757..d79beec 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
@@ -1186,7 +1186,9 @@ public abstract class AbstractIoTDBJDBCResultSet
implements ResultSet {
abstract Object getObjectByName(String columnName) throws SQLException;
public boolean isSetTracingInfo() {
- if (ioTDBRpcTracingInfo == null) return false;
+ if (ioTDBRpcTracingInfo == null) {
+ return false;
+ }
return ioTDBRpcTracingInfo.isSetTracingInfo();
}
diff --git
a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
index 3c822ec..feefd07 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
@@ -261,15 +261,22 @@ public class IoTDBDatabaseMetadata implements
DatabaseMetaData {
"YEAR", "EXCEPT", "OUTPUT", "ZONE", "EXCEPTION"
};
TreeMap myKeywordMap = new TreeMap();
- for (int i = 0; i < allIotdbSQLKeywords.length; i++)
+ for (int i = 0; i < allIotdbSQLKeywords.length; i++) {
myKeywordMap.put(allIotdbSQLKeywords[i], null);
+ }
HashMap sql92KeywordMap = new HashMap(sql92Keywords.length);
- for (int j = 0; j < sql92Keywords.length; j++)
sql92KeywordMap.put(sql92Keywords[j], null);
+ for (int j = 0; j < sql92Keywords.length; j++) {
+ sql92KeywordMap.put(sql92Keywords[j], null);
+ }
Iterator it = sql92KeywordMap.keySet().iterator();
- while (it.hasNext()) myKeywordMap.remove(it.next());
+ while (it.hasNext()) {
+ myKeywordMap.remove(it.next());
+ }
StringBuffer keywordBuf = new StringBuffer();
it = myKeywordMap.keySet().iterator();
- if (it.hasNext()) keywordBuf.append(it.next().toString());
+ if (it.hasNext()) {
+ keywordBuf.append(it.next().toString());
+ }
while (it.hasNext()) {
keywordBuf.append(",");
keywordBuf.append(it.next().toString());
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/StringUtils.java
b/jdbc/src/main/java/org/apache/iotdb/jdbc/StringUtils.java
index 8c7c249..a92cb6c 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/StringUtils.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/StringUtils.java
@@ -37,11 +37,15 @@ public class StringUtils {
static final int WILD_COMPARE_NO_MATCH = -1;
static {
- for (int i = -128; i <= 127; i++) allBytes[i - -128] = (byte) i;
+ for (int i = -128; i <= 127; i++) {
+ allBytes[i - -128] = (byte) i;
+ }
String allBytesString = new String(allBytes, 0, 255);
int allBytesStringLen = allBytesString.length();
int j = 0;
- for (; j < 255 && j < allBytesStringLen; j++) byteToChars[j] =
allBytesString.charAt(j);
+ for (; j < 255 && j < allBytesStringLen; j++) {
+ byteToChars[j] = allBytesString.charAt(j);
+ }
try {
toPlainStringMethod = BigDecimal.class.getMethod("toPlainString", new
Class[0]);
} catch (NoSuchMethodException nsme) {
@@ -49,20 +53,25 @@ public class StringUtils {
}
public static String consistentToString(BigDecimal decimal) {
- if (decimal == null) return null;
- if (toPlainStringMethod != null)
+ if (decimal == null) {
+ return null;
+ }
+ if (toPlainStringMethod != null) {
try {
return (String) toPlainStringMethod.invoke(decimal, null);
} catch (InvocationTargetException invokeEx) {
} catch (IllegalAccessException accessEx) {
}
+ }
return decimal.toString();
}
public static final String fixDecimalExponent(String dString) {
int ePos = dString.indexOf("E");
- if (ePos == -1) ePos = dString.indexOf("e");
+ if (ePos == -1) {
+ ePos = dString.indexOf("e");
+ }
if (ePos != -1 && dString.length() > ePos + 1) {
char maybeMinusChar = dString.charAt(ePos + 1);
if (maybeMinusChar != '-' && maybeMinusChar != '+') {
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
index 09b30e8..feaf8ef 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
@@ -231,12 +231,16 @@ public class WritableMemChunk implements
IWritableMemChunk {
}
public Long getFirstPoint() {
- if (list.size() == 0) return Long.MAX_VALUE;
+ if (list.size() == 0) {
+ return Long.MAX_VALUE;
+ }
return getSortedTvListForQuery().getTimeValuePair(0).getTimestamp();
}
public Long getLastPoint() {
- if (list.size() == 0) return Long.MIN_VALUE;
+ if (list.size() == 0) {
+ return Long.MIN_VALUE;
+ }
return getSortedTvListForQuery()
.getTimeValuePair(getSortedTvListForQuery().size() - 1)
.getTimestamp();
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 07b2d26..0e07e1c 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
@@ -129,7 +129,9 @@ public class LocalTextModificationAccessor
}
private static String encodeModification(Modification mod) {
- if (mod instanceof Deletion) return encodeDeletion((Deletion) mod);
+ if (mod instanceof Deletion) {
+ return encodeDeletion((Deletion) mod);
+ }
return null;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
b/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
index 429eff9..bdd8204 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
@@ -66,7 +66,9 @@ public class TracedBufferedReader extends Reader {
*/
public TracedBufferedReader(Reader in, int sz) {
super(in);
- if (sz <= 0) throw new IllegalArgumentException("Buffer size <= 0");
+ if (sz <= 0) {
+ throw new IllegalArgumentException("Buffer size <= 0");
+ }
this.in = in;
cb = new char[sz];
nextChar = nChars = 0;
@@ -83,7 +85,9 @@ public class TracedBufferedReader extends Reader {
/** Checks to make sure that the stream has not been closed */
private void ensureOpen() throws IOException {
- if (in == null) throw new IOException("Stream closed");
+ if (in == null) {
+ throw new IOException("Stream closed");
+ }
}
/** {@link BufferedReader#fill()} */
@@ -137,7 +141,9 @@ public class TracedBufferedReader extends Reader {
for (; ; ) {
if (nextChar >= nChars) {
fill();
- if (nextChar >= nChars) return -1;
+ if (nextChar >= nChars) {
+ return -1;
+ }
}
if (skipLF) {
skipLF = false;
@@ -164,13 +170,19 @@ public class TracedBufferedReader extends Reader {
}
fill();
}
- if (nextChar >= nChars) return -1;
+ if (nextChar >= nChars) {
+ return -1;
+ }
if (skipLF) {
skipLF = false;
if (cb[nextChar] == '\n') {
nextChar++;
- if (nextChar >= nChars) fill();
- if (nextChar >= nChars) return -1;
+ if (nextChar >= nChars) {
+ fill();
+ }
+ if (nextChar >= nChars) {
+ return -1;
+ }
}
}
int n = Math.min(len, nChars - nextChar);
@@ -195,10 +207,14 @@ public class TracedBufferedReader extends Reader {
}
int n = read1(cbuf, off, len);
- if (n <= 0) return n;
+ if (n <= 0) {
+ return n;
+ }
while ((n < len) && in.ready()) {
int n1 = read1(cbuf, off + n, len - n);
- if (n1 <= 0) break;
+ if (n1 <= 0) {
+ break;
+ }
n += n1;
}
return n;
@@ -217,18 +233,25 @@ public class TracedBufferedReader extends Reader {
bufferLoop:
for (; ; ) {
- if (nextChar >= nChars) fill();
+ if (nextChar >= nChars) {
+ fill();
+ }
if (nextChar >= nChars) {
/* EOF */
- if (s != null && s.length() > 0) return s.toString();
- else return null;
+ if (s != null && s.length() > 0) {
+ return s.toString();
+ } else {
+ return null;
+ }
}
boolean eol = false;
char c = 0;
int i;
/* Skip a leftover '\n', if necessary */
- if (omitLF && (cb[nextChar] == '\n')) nextChar++;
+ if (omitLF && (cb[nextChar] == '\n')) {
+ nextChar++;
+ }
skipLF = false;
omitLF = false;
@@ -262,7 +285,9 @@ public class TracedBufferedReader extends Reader {
return str;
}
- if (s == null) s = new StringBuilder(defaultExpectedLineLength);
+ if (s == null) {
+ s = new StringBuilder(defaultExpectedLineLength);
+ }
s.append(cb, startChar, i - startChar);
}
}
@@ -283,8 +308,13 @@ public class TracedBufferedReader extends Reader {
ensureOpen();
long r = n;
while (r > 0) {
- if (nextChar >= nChars) fill();
- if (nextChar >= nChars) /* EOF */ break;
+ if (nextChar >= nChars) {
+ fill();
+ }
+ if (nextChar >= nChars) {
+ /* EOF */
+ break;
+ }
if (skipLF) {
skipLF = false;
if (cb[nextChar] == '\n') {
@@ -323,7 +353,9 @@ public class TracedBufferedReader extends Reader {
fill();
}
if (nextChar < nChars) {
- if (cb[nextChar] == '\n') nextChar++;
+ if (cb[nextChar] == '\n') {
+ nextChar++;
+ }
skipLF = false;
}
}
@@ -356,8 +388,9 @@ public class TracedBufferedReader extends Reader {
public void reset() throws IOException {
synchronized (lock) {
ensureOpen();
- if (markedChar < 0)
+ if (markedChar < 0) {
throw new IOException((markedChar == INVALIDATED) ? "Mark invalid" :
"Stream not marked");
+ }
nextChar = markedChar;
skipLF = markedSkipLF;
}
@@ -367,7 +400,9 @@ public class TracedBufferedReader extends Reader {
@Override
public void close() throws IOException {
synchronized (lock) {
- if (in == null) return;
+ if (in == null) {
+ return;
+ }
try {
in.close();
} finally {
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 11a9538..b715803 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -921,7 +921,9 @@ public class TsFileResource {
public long degradeTimeIndex() {
TimeIndexLevel timeIndexLevel = TimeIndexLevel.valueOf(timeIndexType);
// if current timeIndex is FileTimeIndex, no need to degrade
- if (timeIndexLevel == TimeIndexLevel.FILE_TIME_INDEX) return 0;
+ if (timeIndexLevel == TimeIndexLevel.FILE_TIME_INDEX) {
+ return 0;
+ }
// get the minimum startTime
long startTime = timeIndex.getMinStartTime();
// get the maximum endTime
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
b/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
index 5866e32..4614976 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
@@ -337,7 +337,9 @@ public class Template {
if (cur.isMeasurement()) {
res.add(getFullPathWithoutTemplateName(cur));
} else {
- for (IMNode child : cur.getChildren().values()) stack.push(child);
+ for (IMNode child : cur.getChildren().values()) {
+ stack.push(child);
+ }
}
}
return res;
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/template/TemplateManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/template/TemplateManager.java
index 010dad6..df5cb73 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/template/TemplateManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/template/TemplateManager.java
@@ -71,8 +71,9 @@ public class TemplateManager {
}
for (List<String> measurements : plan.getMeasurements()) {
- for (String measurement : measurements)
+ for (String measurement : measurements) {
MetaFormatUtils.checkTimeseries(new PartialPath(measurement));
+ }
}
Template template = new Template(plan);
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index dccab92..715c946 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -1106,7 +1106,9 @@ public class PlanExecutor implements IPlanExecutor {
Collections.sort(
tsfiles,
(o1, o2) -> {
- if (establishTime[o1] == establishTime[o2]) return 0;
+ if (establishTime[o1] == establishTime[o2]) {
+ return 0;
+ }
return establishTime[o1] < establishTime[o2] ? -1 : 1;
});
for (Integer i : tsfiles) {
@@ -2095,7 +2097,9 @@ public class PlanExecutor implements IPlanExecutor {
SettleService.getINSTANCE().startSettling(seqResourcesToBeSettled,
unseqResourcesToBeSettled);
StorageEngine.getInstance().setSettling(sgPath, false);
} catch (WriteProcessException e) {
- if (sgPath != null) StorageEngine.getInstance().setSettling(sgPath,
false);
+ if (sgPath != null) {
+ StorageEngine.getInstance().setSettling(sgPath, false);
+ }
throw new StorageEngineException(e.getMessage());
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
index 38a76f7..da7099d 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
@@ -106,9 +106,15 @@ public class LikeOperator extends FunctionOperator {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- if (!super.equals(o)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
LikeOperator that = (LikeOperator) o;
return Objects.equals(value, that.value);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
index 9134cbd..2ecd22e 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
@@ -105,9 +105,15 @@ public class RegexpOperator extends FunctionOperator {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- if (!super.equals(o)) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
RegexpOperator that = (RegexpOperator) o;
return Objects.equals(value, that.value);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
index 3e7a700..e933938 100644
---
a/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
+++
b/server/src/main/java/org/apache/iotdb/db/tools/settle/TsFileAndModSettleTool.java
@@ -350,7 +350,9 @@ public class TsFileAndModSettleTool {
}
}
// if the newPartition folder is empty, then it will be deleted
- if (newPartitionDir.exists()) newPartitionDir.delete();
+ if (newPartitionDir.exists()) {
+ newPartitionDir.delete();
+ }
}
}
diff --git
a/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
b/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
index 1335f3b..b5ac030 100644
--- a/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
+++ b/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
@@ -35,14 +35,17 @@ public class InternalNode extends TemplateNode {
@Override
public void addChild(TemplateNode node) throws StatementExecutionException {
- if (children.containsKey(node.getName()))
+ if (children.containsKey(node.getName())) {
throw new StatementExecutionException("Duplicated child of node in
template.");
+ }
this.children.put(node.getName(), node);
}
@Override
public void deleteChild(TemplateNode node) {
- if (children.containsKey(node.getName())) children.remove(node.getName());
+ if (children.containsKey(node.getName())) {
+ children.remove(node.getName());
+ }
}
public Map<String, TemplateNode> getChildren() {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/GroupByFilter.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/GroupByFilter.java
index d53b450..236f7a4 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/GroupByFilter.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/GroupByFilter.java
@@ -52,19 +52,25 @@ public class GroupByFilter implements Filter, Serializable {
@Override
public boolean satisfy(long time, Object value) {
- if (time < startTime || time >= endTime) return false;
- else return (time - startTime) % slidingStep < interval;
+ if (time < startTime || time >= endTime) {
+ return false;
+ } else {
+ return (time - startTime) % slidingStep < interval;
+ }
}
@Override
public boolean satisfyStartEndTime(long startTime, long endTime) {
- if (endTime < this.startTime || startTime >= this.endTime) return false;
- else if (startTime <= this.startTime) return true;
- else {
+ if (endTime < this.startTime || startTime >= this.endTime) {
+ return false;
+ } else if (startTime <= this.startTime) {
+ return true;
+ } else {
long minTime = startTime - this.startTime;
long count = minTime / slidingStep;
- if (minTime <= interval + count * slidingStep) return true;
- else {
+ if (minTime <= interval + count * slidingStep) {
+ return true;
+ } else {
if (this.endTime <= (count + 1) * slidingStep + this.startTime) {
return false;
} else {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Like.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Like.java
index 7f32f7b..1dc1240 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Like.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Like.java
@@ -61,7 +61,9 @@ public class Like<T extends Comparable<T>> implements Filter {
patternStrBuild.append("^");
for (int i = 0; i < unescapeValue.length(); i++) {
String ch = String.valueOf(unescapeValue.charAt(i));
- if (specialRegexStr.contains(ch)) ch = "\\" + unescapeValue.charAt(i);
+ if (specialRegexStr.contains(ch)) {
+ ch = "\\" + unescapeValue.charAt(i);
+ }
if ((i == 0)
|| (i > 0 && !"\\".equals(String.valueOf(unescapeValue.charAt(i -
1))))
|| (i >= 2
@@ -151,7 +153,9 @@ public class Like<T extends Comparable<T>> implements
Filter {
if (nextChar.equals("%") || nextChar.equals("_") ||
nextChar.equals("\\")) {
out = out + ch;
}
- if (nextChar.equals("\\")) i++;
+ if (nextChar.equals("\\")) {
+ i++;
+ }
}
} else {
out = out + ch;
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java
index e4a3ccf..8407a1f 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/FilePathUtils.java
@@ -93,7 +93,9 @@ public class FilePathUtils {
}
public static String getTsFilePrefixPath(String tsFileAbsolutePath) {
- if (tsFileAbsolutePath == null) return null;
+ if (tsFileAbsolutePath == null) {
+ return null;
+ }
String[] pathSegments = splitTsFilePath(tsFileAbsolutePath);
int pathLength = pathSegments.length;
return pathSegments[pathLength - 4]
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java
index d66f606..1ebecf2 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/StringContainer.java
@@ -327,8 +327,12 @@ public class StringContainer {
@Override
public boolean equals(Object sc) {
- if (sc == null) return false;
- if (this.getClass() != sc.getClass()) return false;
+ if (sc == null) {
+ return false;
+ }
+ if (this.getClass() != sc.getClass()) {
+ return false;
+ }
return this.equals((StringContainer) sc);
}
