[iotdb] branch storage_engine_sonar updated: fix more bug

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch storage_engine_sonar
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/storage_engine_sonar by this 
push:
     new ec3475399ae fix more bug
ec3475399ae is described below

commit ec3475399ae76fe2eff871941e63ebcdd1ebf60d
Author: HTHou <hhao...@outlook.com>
AuthorDate: Mon Jun 26 11:13:36 2023 +0800

    fix more bug
---
 .../java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java  | 8 +++-----
 .../org/apache/iotdb/db/engine/storagegroup/TsFileManager.java    | 4 ----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index 7962e3e635f..7d2b2048d52 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -180,9 +180,6 @@ public class DataRegion implements IDataRegionForQuery {
 
   private static final Logger logger = 
LoggerFactory.getLogger(DataRegion.class);
 
-  /** indicating the file to be loaded overlap with some files. */
-  private static final int POS_OVERLAP = -3;
-
   private final boolean enableMemControl = config.isEnableMemControl();
   /**
    * a read write lock for guaranteeing concurrent safety when accessing all 
fields in this class
@@ -280,7 +277,7 @@ public class DataRegion implements IDataRegionForQuery {
 
   private IDTable idTable;
 
-  private final QueryResourceMetricSet QUERY_RESOURCE_METRIC_SET =
+  private static final QueryResourceMetricSet QUERY_RESOURCE_METRIC_SET =
       QueryResourceMetricSet.getInstance();
 
   private static final PerformanceOverviewMetrics PERFORMANCE_OVERVIEW_METRICS 
=
@@ -429,6 +426,7 @@ public class DataRegion implements IDataRegionForQuery {
   }
 
   /** recover from file */
+  @SuppressWarnings({"squid:S3776","squid:S6541"}) // Suppress high Cognitive 
Complexity warning
   private void recover() throws DataRegionException {
     try {
       recoverCompaction();
@@ -976,7 +974,7 @@ public class DataRegion implements IDataRegionForQuery {
    *
    * @throws BatchProcessException if some of the rows failed to be inserted
    */
-  @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity 
warning
+  @SuppressWarnings({"squid:S3776","squid:S6541"}) // Suppress high Cognitive 
Complexity warning
   public void insertTablet(InsertTabletNode insertTabletNode)
       throws BatchProcessException, WriteProcessException {
     if (enableMemControl) {
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileManager.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileManager.java
index 953ff7141a2..a4897760b21 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileManager.java
@@ -21,9 +21,6 @@ package org.apache.iotdb.db.engine.storagegroup;
 
 import org.apache.iotdb.db.rescon.TsFileResourceManager;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -37,7 +34,6 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class TsFileManager {
-  private static final Logger LOGGER = 
LoggerFactory.getLogger(TsFileManager.class);
   private String storageGroupName;
   private String dataRegionId;
   private String storageGroupDir;