This is an automated email from the ASF dual-hosted git repository.
zyk 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 64a7643ca44 Fix sonar bugs and code smells in iotdb/db/metadata/rescon
(#10265)
64a7643ca44 is described below
commit 64a7643ca4456a6323c6f092bc7754a4f9e1b9db
Author: Chen YZ <[email protected]>
AuthorDate: Wed Jun 21 23:19:22 2023 +0800
Fix sonar bugs and code smells in iotdb/db/metadata/rescon (#10265)
---
.../iotdb/db/metadata/metric/SchemaRegionCachedMetric.java | 4 ++--
.../db/metadata/rescon/CachedSchemaEngineStatistics.java | 3 ++-
.../db/metadata/rescon/CachedSchemaRegionStatistics.java | 13 +++++++------
.../db/metadata/rescon/DataNodeSchemaQuotaManager.java | 2 ++
.../iotdb/db/metadata/rescon/ISchemaEngineStatistics.java | 1 +
.../iotdb/db/metadata/rescon/ISchemaRegionStatistics.java | 1 +
.../iotdb/db/metadata/rescon/MemSchemaEngineStatistics.java | 5 +++--
.../iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java | 13 +++++++------
.../db/metadata/schemaregion/SchemaRegionPBTreeImpl.java | 4 ++--
9 files changed, 27 insertions(+), 19 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaRegionCachedMetric.java
b/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaRegionCachedMetric.java
index 8178174573e..86156f463f6 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaRegionCachedMetric.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/metric/SchemaRegionCachedMetric.java
@@ -109,7 +109,7 @@ public class SchemaRegionCachedMetric implements
ISchemaRegionMetric {
Metric.SCHEMA_REGION.toString(),
MetricLevel.IMPORTANT,
regionStatistics,
- CachedSchemaRegionStatistics::getMLogLength,
+ CachedSchemaRegionStatistics::getMlogLength,
Tag.NAME.toString(),
MLOG_LENGTH,
Tag.REGION.toString(),
@@ -118,7 +118,7 @@ public class SchemaRegionCachedMetric implements
ISchemaRegionMetric {
Metric.SCHEMA_REGION.toString(),
MetricLevel.IMPORTANT,
regionStatistics,
- CachedSchemaRegionStatistics::getMLogCheckPoint,
+ CachedSchemaRegionStatistics::getMlogCheckPoint,
Tag.NAME.toString(),
MLOG_CHECKPOINT,
Tag.REGION.toString(),
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
index 8659f48a41c..62f6fa8b7f2 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaEngineStatistics.java
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
import java.util.concurrent.atomic.AtomicLong;
/**
* This class is used to record global statistics for SchemaEngine in PBTree
mode, which is a
- * superset of the statistics in Memory mode
+ * superset of the statistics in Memory mode.
*/
public class CachedSchemaEngineStatistics extends MemSchemaEngineStatistics {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
index 7be61c6c618..e0643caaebb 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/CachedSchemaRegionStatistics.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
import org.apache.iotdb.db.metadata.mtree.store.disk.cache.ICacheManager;
@@ -24,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* This class is used to record statistics within a SchemaRegion in PBTree
mode, which is a superset
- * of the statistics in Memory mode
+ * of the statistics in Memory mode.
*/
public class CachedSchemaRegionStatistics extends MemSchemaRegionStatistics {
@@ -33,7 +34,7 @@ public class CachedSchemaRegionStatistics extends
MemSchemaRegionStatistics {
private final AtomicLong unpinnedMNodeNum = new AtomicLong(0);
private final AtomicLong pinnedMNodeNum = new AtomicLong(0);
- private long mLogCheckPoint = 0;
+ private long mlogCheckPoint = 0;
private ICacheManager cacheManager;
@@ -65,8 +66,8 @@ public class CachedSchemaRegionStatistics extends
MemSchemaRegionStatistics {
cachedEngineStatistics.updateUnpinnedMemorySize(delta);
}
- public void setMLogCheckPoint(long mLogCheckPoint) {
- this.mLogCheckPoint = mLogCheckPoint;
+ public void setMlogCheckPoint(long mlogCheckPoint) {
+ this.mlogCheckPoint = mlogCheckPoint;
}
public void setCacheManager(ICacheManager cacheManager) {
@@ -89,8 +90,8 @@ public class CachedSchemaRegionStatistics extends
MemSchemaRegionStatistics {
return pinnedMNodeNum.get();
}
- public long getMLogCheckPoint() {
- return mLogCheckPoint;
+ public long getMlogCheckPoint() {
+ return mlogCheckPoint;
}
public long getBufferNodeNum() {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/DataNodeSchemaQuotaManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/DataNodeSchemaQuotaManager.java
index ce76b2c3435..e390fe795a1 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/DataNodeSchemaQuotaManager.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/DataNodeSchemaQuotaManager.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
import org.apache.iotdb.commons.schema.ClusterSchemaQuotaLevel;
@@ -24,6 +25,7 @@ import
org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException;
import java.util.concurrent.atomic.AtomicLong;
+@SuppressWarnings("java:S6548") // do not warn about singleton class
public class DataNodeSchemaQuotaManager {
private ClusterSchemaQuotaLevel level =
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaEngineStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaEngineStatistics.java
index 88189f68b16..df9e572adf4 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaEngineStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaEngineStatistics.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
public interface ISchemaEngineStatistics {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaRegionStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaRegionStatistics.java
index 7b6c28f8ada..fc5b6f542d1 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaRegionStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/ISchemaRegionStatistics.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
public interface ISchemaRegionStatistics {
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaEngineStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaEngineStatistics.java
index d1df6690c10..526b239ac39 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaEngineStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaEngineStatistics.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -29,12 +30,12 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-/** This class is used to record the global statistics of SchemaEngine in
Memory mode */
+/** This class is used to record the global statistics of SchemaEngine in
Memory mode. */
public class MemSchemaEngineStatistics implements ISchemaEngineStatistics {
private static final Logger logger =
LoggerFactory.getLogger(MemSchemaEngineStatistics.class);
- /** Total size of schema region */
+ // Total size of schema region
private final long memoryCapacity =
IoTDBDescriptor.getInstance().getConfig().getAllocateMemoryForSchemaRegion();
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java
index be5ededa427..5058feaaeed 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemSchemaRegionStatistics.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.metadata.rescon;
import org.apache.iotdb.db.metadata.template.ClusterTemplateManager;
@@ -25,7 +26,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-/** This class is used to record statistics within the SchemaRegion in Memory
mode */
+/** This class is used to record statistics within the SchemaRegion in Memory
mode. */
public class MemSchemaRegionStatistics implements ISchemaRegionStatistics {
protected MemSchemaEngineStatistics schemaEngineStatistics;
@@ -35,7 +36,7 @@ public class MemSchemaRegionStatistics implements
ISchemaRegionStatistics {
private final AtomicLong devicesNumber = new AtomicLong(0);
private final Map<Integer, Integer> templateUsage = new
ConcurrentHashMap<>();
- private long mLogLength = 0;
+ private long mlogLength = 0;
public MemSchemaRegionStatistics(int schemaRegionId, ISchemaEngineStatistics
engineStatistics) {
this.schemaEngineStatistics =
engineStatistics.getAsMemSchemaEngineStatistics();
@@ -122,12 +123,12 @@ public class MemSchemaRegionStatistics implements
ISchemaRegionStatistics {
return schemaRegionId;
}
- public void setMLogLength(long mLogLength) {
- this.mLogLength = mLogLength;
+ public void setMlogLength(long mlogLength) {
+ this.mlogLength = mlogLength;
}
- public long getMLogLength() {
- return mLogLength;
+ public long getMlogLength() {
+ return mlogLength;
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
index ca4ff08f53a..e5dc578394b 100644
---
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
+++
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionPBTreeImpl.java
@@ -245,7 +245,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
if (usingMLog && !isRecovering) {
try {
logDescriptionWriter.updateCheckPoint(logWriter.position());
- regionStatistics.setMLogCheckPoint(logWriter.position());
+ regionStatistics.setMlogCheckPoint(logWriter.position());
} catch (IOException e) {
logger.warn(
"Update {} failed because {}",
@@ -298,7 +298,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
public void writeToMLog(ISchemaRegionPlan schemaRegionPlan) throws
IOException {
if (usingMLog && !isRecovering) {
logWriter.write(schemaRegionPlan);
- regionStatistics.setMLogLength(logWriter.position());
+ regionStatistics.setMlogLength(logWriter.position());
}
}
