You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/01/12 05:09:05 UTC
[iotdb] branch rel/1.0 updated: [To rel/1.0][IOTDB-5284] Fix some code smells (#8827)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.0 by this push:
new 49aeebcb0e [To rel/1.0][IOTDB-5284] Fix some code smells (#8827)
49aeebcb0e is described below
commit 49aeebcb0e55c8852092219d403203e72dd9a3a3
Author: BUAAserein <65...@users.noreply.github.com>
AuthorDate: Thu Jan 12 13:08:59 2023 +0800
[To rel/1.0][IOTDB-5284] Fix some code smells (#8827)
* fix some code smells
---
.../metadata/schemafile/RecordDuplicatedException.java | 2 +-
.../metadata/schemafile/SegmentOverflowException.java | 9 +++------
.../metadata/template/DifferentTemplateException.java | 2 +-
.../metadata/template/NoTemplateOnMNodeException.java | 2 +-
.../metadata/template/UndefinedTemplateException.java | 2 +-
.../apache/iotdb/db/metadata/LocalSchemaProcessor.java | 2 ++
.../iotdb/db/metadata/cache/DataNodeSchemaCache.java | 1 -
.../metadata/idtable/AppendOnlyDiskSchemaManager.java | 6 +++---
.../org/apache/iotdb/db/metadata/idtable/IDTable.java | 2 +-
.../java/org/apache/iotdb/db/metadata/mnode/MNode.java | 2 +-
.../db/metadata/mnode/container/MNodeContainers.java | 7 +++++++
.../db/metadata/mtree/store/CachedMTreeStore.java | 18 ++++++------------
.../metadata/mtree/store/disk/cache/CacheManager.java | 6 ++----
.../disk/memcontrol/CachedMNodeSizeEstimator.java | 1 +
.../mtree/store/disk/schemafile/AliasIndexPage.java | 2 +-
.../mtree/store/disk/schemafile/InternalPage.java | 2 +-
.../mtree/store/disk/schemafile/MockSchemaFile.java | 12 +++++-------
.../mtree/store/disk/schemafile/SchemaFile.java | 3 +--
.../mtree/store/disk/schemafile/SchemaPage.java | 4 ++--
.../metadata/mtree/store/disk/schemafile/Segment.java | 2 +-
.../mtree/store/disk/schemafile/SegmentedPage.java | 6 +++---
.../disk/schemafile/pagemgr/BTreePageManager.java | 12 ++++++------
.../store/disk/schemafile/pagemgr/PageManager.java | 2 +-
.../iotdb/db/metadata/mtree/traverser/Traverser.java | 3 ++-
.../mtree/traverser/collector/EntityCollector.java | 4 ++--
.../traverser/collector/MNodeAboveSGCollector.java | 2 +-
.../mtree/traverser/collector/MNodeCollector.java | 2 +-
.../traverser/collector/StorageGroupCollector.java | 2 +-
.../mtree/traverser/counter/CounterTraverser.java | 2 +-
.../mtree/traverser/counter/MeasurementCounter.java | 6 ++----
.../counter/MeasurementGroupByLevelCounter.java | 6 ++----
.../iotdb/db/metadata/schemaregion/SchemaEngine.java | 8 ++++----
.../schemaregion/SchemaRegionSchemaFileImpl.java | 3 +--
.../db/metadata/template/ClusterTemplateManager.java | 2 +-
.../apache/iotdb/db/metadata/template/Template.java | 2 +-
.../org/apache/iotdb/db/metadata/utils/MetaUtils.java | 1 +
36 files changed, 71 insertions(+), 79 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/RecordDuplicatedException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/RecordDuplicatedException.java
index f4a9b0f38c..8a233ffc42 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/RecordDuplicatedException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/RecordDuplicatedException.java
@@ -27,7 +27,7 @@ public class RecordDuplicatedException extends MetadataException {
public RecordDuplicatedException(String recordKey) {
super(
- String.format("Segment has duplicated record key : " + recordKey),
+ String.format("Segment has duplicated record key : %s", recordKey),
TSStatusCode.RECORD_DUPLICATED.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SegmentOverflowException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SegmentOverflowException.java
index 33650677d2..ee25943e69 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SegmentOverflowException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/schemafile/SegmentOverflowException.java
@@ -27,21 +27,18 @@ public class SegmentOverflowException extends MetadataException {
public SegmentOverflowException(int tarIndex) {
super(
- String.format("Segment overflow : " + tarIndex),
+ String.format("Segment overflow : %d", tarIndex),
TSStatusCode.SEGMENT_OUT_OF_SPACE.getStatusCode(),
true);
}
public SegmentOverflowException() {
- super(
- String.format("Segment not enough space"),
- TSStatusCode.SEGMENT_OUT_OF_SPACE.getStatusCode(),
- true);
+ super("Segment not enough space", TSStatusCode.SEGMENT_OUT_OF_SPACE.getStatusCode(), true);
}
public SegmentOverflowException(String key) {
super(
- String.format("Segment not enough space even after split and compact to insert: " + key),
+ String.format("Segment not enough space even after split and compact to insert: %s", key),
TSStatusCode.SEGMENT_OUT_OF_SPACE.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/DifferentTemplateException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/DifferentTemplateException.java
index 49c5d73216..9da6480dc6 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/DifferentTemplateException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/DifferentTemplateException.java
@@ -27,7 +27,7 @@ public class DifferentTemplateException extends MetadataException {
public DifferentTemplateException(String path, String templateName) {
super(
- String.format("The template on " + path + " is different from " + templateName),
+ String.format("The template on %s is different from %s", path, templateName),
TSStatusCode.DIFFERENT_TEMPLATE.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/NoTemplateOnMNodeException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/NoTemplateOnMNodeException.java
index f6be5489b9..0f2a274235 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/NoTemplateOnMNodeException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/NoTemplateOnMNodeException.java
@@ -27,7 +27,7 @@ public class NoTemplateOnMNodeException extends MetadataException {
public NoTemplateOnMNodeException(String path) {
super(
- String.format("NO template on " + path),
+ String.format("NO template on %s", path),
TSStatusCode.TEMPLATE_NOT_SET.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/UndefinedTemplateException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/UndefinedTemplateException.java
index 5a71baa16a..672a75cef1 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/UndefinedTemplateException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/metadata/template/UndefinedTemplateException.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.rpc.TSStatusCode;
public class UndefinedTemplateException extends MetadataException {
public UndefinedTemplateException(String path) {
super(
- String.format("Undefined template name: " + path),
+ String.format("Undefined template name: %s", path),
TSStatusCode.UNDEFINED_TEMPLATE.getStatusCode(),
true);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java b/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
index 4549b75301..471b50ee20 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/LocalSchemaProcessor.java
@@ -96,6 +96,8 @@ import static java.util.stream.Collectors.toList;
* <li>Interfaces for alias and tag/attribute operations
* <li>TestOnly Interfaces
* </ol>
+ *
+ * @deprecated
*/
@SuppressWarnings("java:S1135") // ignore todos
public class LocalSchemaProcessor {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
index c5614e34eb..b8d6ba10dd 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
@@ -87,7 +87,6 @@ public class DataNodeSchemaCache {
public void takeWriteLock() {
readWriteLock.writeLock().lock();
- ;
}
public void releaseWriteLock() {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
index 126c7a0d29..a5110ec2e8 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java
@@ -90,7 +90,7 @@ public class AppendOnlyDiskSchemaManager implements IDiskSchemaManager {
throw new IOException("File corruption");
}
} else {
- logger.debug("create new file for id table: " + dir.getName());
+ logger.debug("create new file for id table: {}", dir.getName());
boolean createRes = dataFile.createNewFile();
if (!createRes) {
throw new IOException(
@@ -120,7 +120,7 @@ public class AppendOnlyDiskSchemaManager implements IDiskSchemaManager {
return false;
}
} catch (Exception e) {
- logger.error("File check failed" + e);
+ logger.error("File check failed", e);
return false;
}
@@ -133,7 +133,7 @@ public class AppendOnlyDiskSchemaManager implements IDiskSchemaManager {
try {
loc += schemaEntry.serialize(outputStream);
} catch (IOException e) {
- logger.error("failed to serialize schema entry: " + schemaEntry);
+ logger.error("failed to serialize schema entry: {}", schemaEntry);
throw new IllegalArgumentException("can't serialize disk entry of " + schemaEntry);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
index 5b81f5bcc3..3862f94ed5 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
@@ -155,7 +155,7 @@ public interface IDTable {
timeseriesID.getMeasurement(),
fullPath.getMeasurementSchema());
} catch (MetadataException e) {
- logger.error("Error when translate query path: " + fullPath);
+ logger.error("Error when translate query path: {}", fullPath);
throw new IllegalArgumentException("can't translate path to device id, path is: " + fullPath);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
index 95cb468267..cfd7f6ee4d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNode.java
@@ -39,7 +39,7 @@ public abstract class MNode implements IMNode {
protected CacheEntry cacheEntry;
/** Constructor of MNode. */
- public MNode(IMNode parent, String name) {
+ protected MNode(IMNode parent, String name) {
this.parent = parent;
this.name = name;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
index 229d9c95b5..ad473edac0 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
@@ -60,31 +60,38 @@ public class MNodeContainers {
private static class EmptyContainer extends AbstractMap<String, IMNode>
implements IMNodeContainer {
+ @Override
public int size() {
return 0;
}
+ @Override
public boolean isEmpty() {
return true;
}
+ @Override
public boolean containsKey(Object key) {
return false;
}
+ @Override
public boolean containsValue(Object value) {
return false;
}
+ @Override
public IMNode get(Object key) {
return null;
}
+ @Override
@NotNull
public Set<String> keySet() {
return emptySet();
}
+ @Override
@NotNull
public Collection<IMNode> values() {
return emptySet();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
index 497c34bb43..fe84289890 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/CachedMTreeStore.java
@@ -409,10 +409,8 @@ public class CachedMTreeStore implements IMTreeStore {
}
private void ensureMemoryStatus() {
- if (memManager.isExceedFlushThreshold()) {
- if (!hasReleaseTask) {
- registerReleaseTask();
- }
+ if (memManager.isExceedFlushThreshold() && !hasReleaseTask) {
+ registerReleaseTask();
}
}
@@ -438,10 +436,8 @@ public class CachedMTreeStore implements IMTreeStore {
} finally {
readLock.unlock();
}
- if (memManager.isExceedFlushThreshold()) {
- if (!hasFlushTask) {
- registerFlushTask();
- }
+ if (memManager.isExceedFlushThreshold() && !hasFlushTask) {
+ registerFlushTask();
}
}
@@ -544,10 +540,8 @@ public class CachedMTreeStore implements IMTreeStore {
// must invoke hasNext() first
@Override
public IMNode next() {
- if (nextNode == null) {
- if (!hasNext()) {
- throw new NoSuchElementException();
- }
+ if (nextNode == null && !hasNext()) {
+ throw new NoSuchElementException();
}
IMNode result = nextNode;
nextNode = null;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/cache/CacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/cache/CacheManager.java
index 39fb5414bc..d9dc2301ed 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/cache/CacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/cache/CacheManager.java
@@ -443,10 +443,8 @@ public abstract class CacheManager implements ICacheManager {
}
}
- if (isPinStatusChanged) {
- if (!node.isStorageGroup()) {
- doUnPin(node.getParent());
- }
+ if (isPinStatusChanged && !node.isStorageGroup()) {
+ doUnPin(node.getParent());
}
return isPinStatusChanged;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/CachedMNodeSizeEstimator.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/CachedMNodeSizeEstimator.java
index 2f1ee23d17..54f7567eec 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/CachedMNodeSizeEstimator.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/CachedMNodeSizeEstimator.java
@@ -46,6 +46,7 @@ public class CachedMNodeSizeEstimator extends BasicMNodSizeEstimator {
private static final int INTERNAL_NODE_BASE_SIZE =
BasicMNodSizeEstimator.INTERNAL_NODE_BASE_SIZE + CACHED_MNODE_CONTAINER_SIZE_DELTA;
+ @Override
public int estimateSize(IMNode node) {
int size = NODE_BASE_SIZE + node.getName().length();
if (node.isMeasurement()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/AliasIndexPage.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/AliasIndexPage.java
index cc2d9b7c0f..035aecd94b 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/AliasIndexPage.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/AliasIndexPage.java
@@ -380,7 +380,7 @@ public class AliasIndexPage extends SchemaPage implements ISegment<String, Strin
StringBuilder builder =
new StringBuilder(
String.format(
- "page_id:%d, total_seg:%d, spare_before:%d\n", pageIndex, 1, spareOffset));
+ "page_id:%d, total_seg:%d, spare_before:%d%n", pageIndex, 1, spareOffset));
builder.append(
String.format(
"[AliasIndexSegment, total_alias: %d, spare_size:%d,", this.memberNum, this.spareSize));
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/InternalPage.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/InternalPage.java
index e61bc1b436..f56d767e05 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/InternalPage.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/InternalPage.java
@@ -417,7 +417,7 @@ public class InternalPage extends SchemaPage implements ISegment<Integer, Intege
StringBuilder builder =
new StringBuilder(
String.format(
- "page_id:%d, spare_offset:%d, spare_size:%d\n", pageIndex, spareOffset, spareSize));
+ "page_id:%d, spare_offset:%d, spare_size:%d%n", pageIndex, spareOffset, spareSize));
builder.append(
String.format(
"[IndexEntrySegment, total_ptrs:%d, spare_size:%d, sub_index:%d, ",
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
index f0092a37c7..0b3f6bd8c0 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
@@ -77,13 +77,11 @@ public class MockSchemaFile implements ISchemaFile {
IMNode result = null;
if (segment != null) {
result = cloneMNode(segment.get(childName));
- if (result == null) {
- if (parent.isEntity()) {
- for (IMNode node : segment.values()) {
- if (node.isMeasurement() && childName.equals(node.getAsMeasurementMNode().getAlias())) {
- result = cloneMNode(node);
- break;
- }
+ if (result == null && parent.isEntity()) {
+ for (IMNode node : segment.values()) {
+ if (node.isMeasurement() && childName.equals(node.getAsMeasurementMNode().getAlias())) {
+ result = cloneMNode(node);
+ break;
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
index f886b8169f..ad63aaae6e 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
@@ -92,8 +92,7 @@ public class SchemaFile implements ISchemaFile {
}
if (pmtFile.exists() && override) {
- logger.warn(
- String.format("Schema File [%s] will be overwritten since already exists.", filePath));
+ logger.warn("Schema File [{}] will be overwritten since already exists.", filePath);
Files.delete(Paths.get(pmtFile.toURI()));
pmtFile.createNewFile();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaPage.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaPage.java
index 05d4afcac7..c915065d78 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaPage.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaPage.java
@@ -70,7 +70,7 @@ public abstract class SchemaPage implements ISchemaPage {
ReadWriteIOUtils.write(spareOffset, pageBuffer);
ReadWriteIOUtils.write(spareSize, pageBuffer);
ReadWriteIOUtils.write(memberNum, pageBuffer);
- };
+ }
@Override
public void flushPageToChannel(FileChannel channel) throws IOException {
@@ -148,7 +148,7 @@ public abstract class SchemaPage implements ISchemaPage {
@TestOnly
public WrappedSegment getSegmentOnTest(short idx) throws SegmentNotFoundException {
return null;
- };
+ }
@Override
@TestOnly
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/Segment.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/Segment.java
index b22124223b..d1abdf2b63 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/Segment.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/Segment.java
@@ -422,7 +422,7 @@ public abstract class Segment<R> implements ISegment<ByteBuffer, R> {
*/
protected static <T> int binaryInsertPairList(List<Pair<String, T>> list, String key)
throws RecordDuplicatedException {
- if (list.size() == 0) {
+ if (list.isEmpty()) {
return 0;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SegmentedPage.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SegmentedPage.java
index cde098ccc1..a9f9b5acef 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SegmentedPage.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SegmentedPage.java
@@ -260,17 +260,17 @@ public class SegmentedPage extends SchemaPage implements ISegmentedPage {
StringBuilder builder =
new StringBuilder(
String.format(
- "page_id:%d, total_seg:%d, spare_from:%d, spare_size:%d\n",
+ "page_id:%d, total_seg:%d, spare_from:%d, spare_size:%d%n",
pageIndex, memberNum, spareOffset, spareSize));
for (short idx = 0; idx < segOffsetLst.size(); idx++) {
short offset = segOffsetLst.get(idx);
if (offset < 0) {
- builder.append(String.format("seg_id:%d deleted, offset:%d\n", idx, offset));
+ builder.append(String.format("seg_id:%d deleted, offset:%d%n", idx, offset));
} else {
ISegment<?, ?> seg = getSegment(idx);
builder.append(
String.format(
- "seg_id:%d, offset:%d, address:%s, next_seg:%s, %s\n",
+ "seg_id:%d, offset:%d, address:%s, next_seg:%s, %s%n",
idx,
offset,
Long.toHexString(SchemaFile.getGlobalIndex(pageIndex, idx)),
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
index 75f6a2b052..a1e4e89cb7 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/BTreePageManager.java
@@ -116,8 +116,8 @@ public class BTreePageManager extends PageManager {
Queue<IMNode> children = cursorPage.getAsSegmentedPage().getChildren((short) 0);
IMNode child;
// TODO: inefficient to build B+Tree up-to-bottom, improve further
- while (children.size() != 0 || nextAddr != -1L) {
- if (children.size() == 0) {
+ while (!children.isEmpty() || nextAddr != -1L) {
+ if (children.isEmpty()) {
cursorPage = getPageInstance(getPageIndex(nextAddr));
nextAddr = cursorPage.getAsSegmentedPage().getNextSegAddress((short) 0);
children = cursorPage.getAsSegmentedPage().getChildren((short) 0);
@@ -322,7 +322,7 @@ public class BTreePageManager extends PageManager {
cascadePages.add(tarPage.getSubIndex());
}
- while (cascadePages.size() != 0) {
+ while (!cascadePages.isEmpty()) {
if (dirtyPages.size() > SchemaFileConfig.PAGE_CACHE_SIZE) {
flushDirtyPages();
}
@@ -415,7 +415,7 @@ public class BTreePageManager extends PageManager {
@Override
public boolean hasNext() {
- if (children.size() > 0) {
+ if (!children.isEmpty()) {
return true;
}
if (nextSeg < 0) {
@@ -424,7 +424,7 @@ public class BTreePageManager extends PageManager {
try {
ISchemaPage nPage;
- while (children.size() == 0 && nextSeg >= 0) {
+ while (children.isEmpty() && nextSeg >= 0) {
nPage = getPageInstance(getPageIndex(nextSeg));
children = nPage.getAsSegmentedPage().getChildren(getSegIndex(nextSeg));
nextSeg = nPage.getAsSegmentedPage().getNextSegAddress(getSegIndex(nextSeg));
@@ -434,7 +434,7 @@ public class BTreePageManager extends PageManager {
return false;
}
- return children.size() > 0;
+ return !children.isEmpty();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
index e755a248bd..87891ff6cf 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/pagemgr/PageManager.java
@@ -130,7 +130,7 @@ public abstract class PageManager implements IPageManager {
reader.close();
// complete log file
- if (res.size() != 0) {
+ if (!res.isEmpty()) {
FileOutputStream outputStream = new FileOutputStream(logPath, true);
outputStream.write(new byte[] {SchemaFileConfig.SF_COMMIT_MARK});
long length = outputStream.getChannel().size();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/Traverser.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/Traverser.java
index 47a16bcb21..5b4589e18c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/Traverser.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/Traverser.java
@@ -82,7 +82,8 @@ public abstract class Traverser {
* @param path use wildcard to specify which part to traverse
* @throws MetadataException
*/
- public Traverser(IMNode startNode, PartialPath path, IMTreeStore store) throws MetadataException {
+ protected Traverser(IMNode startNode, PartialPath path, IMTreeStore store)
+ throws MetadataException {
String[] nodes = path.getNodes();
if (nodes.length == 0 || !nodes[0].equals(PATH_ROOT)) {
throw new IllegalPathException(
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/EntityCollector.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/EntityCollector.java
index 5c7b54faa4..9b80facaac 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/EntityCollector.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/EntityCollector.java
@@ -27,12 +27,12 @@ import org.apache.iotdb.db.metadata.mtree.store.IMTreeStore;
// This class defines EntityMNode as target node and defines the Entity process framework.
public abstract class EntityCollector<T> extends CollectorTraverser<T> {
- public EntityCollector(IMNode startNode, PartialPath path, IMTreeStore store)
+ protected EntityCollector(IMNode startNode, PartialPath path, IMTreeStore store)
throws MetadataException {
super(startNode, path, store);
}
- public EntityCollector(
+ protected EntityCollector(
IMNode startNode, PartialPath path, IMTreeStore store, int limit, int offset)
throws MetadataException {
super(startNode, path, store, limit, offset);
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java
index ec6ba13b9b..f97fe38d74 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeAboveSGCollector.java
@@ -30,7 +30,7 @@ public abstract class MNodeAboveSGCollector<T> extends MNodeCollector<T> {
protected Set<PartialPath> involvedStorageGroupMNodes = new HashSet<>();
- public MNodeAboveSGCollector(IMNode startNode, PartialPath path, IMTreeStore store)
+ protected MNodeAboveSGCollector(IMNode startNode, PartialPath path, IMTreeStore store)
throws MetadataException {
super(startNode, path, store);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeCollector.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeCollector.java
index 4b7ae272e5..53c57eea7c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeCollector.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/MNodeCollector.java
@@ -41,7 +41,7 @@ public abstract class MNodeCollector<T> extends CollectorTraverser<T> {
private Set<IMNode> processedNodes = new HashSet<>();
- public MNodeCollector(IMNode startNode, PartialPath path, IMTreeStore store)
+ protected MNodeCollector(IMNode startNode, PartialPath path, IMTreeStore store)
throws MetadataException {
super(startNode, path, store);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/StorageGroupCollector.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/StorageGroupCollector.java
index e4b71d8dd0..2017efbb5f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/StorageGroupCollector.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/collector/StorageGroupCollector.java
@@ -29,7 +29,7 @@ public abstract class StorageGroupCollector<T> extends CollectorTraverser<T> {
protected boolean collectInternal = false;
- public StorageGroupCollector(IMNode startNode, PartialPath path, IMTreeStore store)
+ protected StorageGroupCollector(IMNode startNode, PartialPath path, IMTreeStore store)
throws MetadataException {
super(startNode, path, store);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/CounterTraverser.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/CounterTraverser.java
index 2cf5b3ac47..b1312cfb58 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/CounterTraverser.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/CounterTraverser.java
@@ -29,7 +29,7 @@ public abstract class CounterTraverser extends Traverser {
protected long count;
- public CounterTraverser(IMNode startNode, PartialPath path, IMTreeStore store)
+ protected CounterTraverser(IMNode startNode, PartialPath path, IMTreeStore store)
throws MetadataException {
super(startNode, path, store);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementCounter.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementCounter.java
index 6fe05844ec..49f61f6b8f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementCounter.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementCounter.java
@@ -62,10 +62,8 @@ public class MeasurementCounter extends CounterTraverser {
if (!node.isMeasurement()) {
return false;
}
- if (hasTag) {
- if (!timeseries.contains(node.getFullPath())) {
- return true;
- }
+ if (hasTag && !timeseries.contains(node.getFullPath())) {
+ return true;
}
count++;
return true;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementGroupByLevelCounter.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementGroupByLevelCounter.java
index 43c7521d80..698905d8d6 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementGroupByLevelCounter.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/traverser/counter/MeasurementGroupByLevelCounter.java
@@ -105,10 +105,8 @@ public class MeasurementGroupByLevelCounter extends Traverser {
if (!node.isMeasurement()) {
return false;
}
- if (hasTag) {
- if (!timeseries.contains(node.getFullPath())) {
- return true;
- }
+ if (hasTag && !timeseries.contains(node.getFullPath())) {
+ return true;
}
if (level >= groupByLevel) {
result.put(path, result.get(path) + 1);
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
index 73ea7e1a64..7f597de7e9 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
@@ -204,7 +204,7 @@ public class SchemaEngine {
ISchemaRegion schemaRegion = future.get();
schemaRegionMap.put(schemaRegion.getSchemaRegionId(), schemaRegion);
} catch (ExecutionException | InterruptedException | RuntimeException e) {
- logger.error("Something wrong happened during SchemaRegion recovery: " + e.getMessage());
+ logger.error("Something wrong happened during SchemaRegion recovery: {}", e.getMessage());
e.printStackTrace();
}
}
@@ -277,9 +277,9 @@ public class SchemaEngine {
createSchemaRegionWithoutExistenceCheck(storageGroup, schemaRegionId);
timeRecord = System.currentTimeMillis() - timeRecord;
logger.info(
- String.format(
- "Recover [%s] spend: %s ms",
- storageGroup.concatNode(schemaRegionId.toString()), timeRecord));
+ "Recover [{}] spend: {} ms",
+ storageGroup.concatNode(schemaRegionId.toString()),
+ timeRecord);
return schemaRegion;
} catch (MetadataException e) {
logger.error(
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
index 1ddca04302..f6e039ff2d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
@@ -561,8 +561,7 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
@SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
public void createTimeseries(ICreateTimeSeriesPlan plan, long offset) throws MetadataException {
if (!memoryStatistics.isAllowToCreateNewSeries()) {
- logger.error(
- String.format("Series overflow when creating: [%s]", plan.getPath().getFullPath()));
+ logger.error("Series overflow when creating: [{}]", plan.getPath().getFullPath());
throw new SeriesOverflowException();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/template/ClusterTemplateManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/template/ClusterTemplateManager.java
index 88f87b6639..cd1e8927d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/template/ClusterTemplateManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/template/ClusterTemplateManager.java
@@ -185,7 +185,7 @@ public class ClusterTemplateManager implements ITemplateManager {
@Override
public List<PartialPath> getPathsSetTemplate(String name) {
- List<PartialPath> listPath = new ArrayList<PartialPath>();
+ List<PartialPath> listPath = new ArrayList<>();
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
TGetPathsSetTemplatesResp resp = configNodeClient.getPathsSetTemplate(name);
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 9b6c0961cb..bfc1e5bd3d 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
@@ -221,7 +221,7 @@ public class Template implements Serializable {
prefix = joinBySeparator(Arrays.copyOf(pathNodes, pathNodes.length - 1));
}
- if (checkSet.size() == 0) {
+ if (checkSet.isEmpty()) {
checkSet.add(prefix);
}
if (!checkSet.contains(prefix)) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
index 960c453b73..63f4c7f704 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
@@ -78,6 +78,7 @@ public class MetaUtils {
* of one device has already been placed contiguously.
* @return Size of partial path list could NOT equal to the input list size. For example, the
* vector1 (s1,s2) would be returned once.
+ * @deprecated
*/
public static List<PartialPath> groupAlignedPaths(List<PartialPath> fullPaths) {
List<PartialPath> result = new LinkedList<>();