This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/sonar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty/sonar by this push:
new 724e17715b5 server/src/main/java/org/apache/iotdb/db/engine/cache
partially done
724e17715b5 is described below
commit 724e17715b5f9360eb69bb24951e4964484319e8
Author: JackieTien97 <[email protected]>
AuthorDate: Mon Jun 19 14:56:19 2023 +0800
server/src/main/java/org/apache/iotdb/db/engine/cache partially done
---
.../iotdb/db/engine/cache/BloomFilterCache.java | 1 +
.../db/engine/cache/CacheHitRatioMonitor.java | 5 ++--
.../engine/cache/CacheHitRatioMonitorMXBean.java | 1 +
.../db/engine/cache/TimeSeriesMetadataCache.java | 10 ++++----
.../operator/source/SeriesScanOperator.java | 28 ++++------------------
5 files changed, 14 insertions(+), 31 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
index b1d5b0b5b40..91cc0fa1e1d 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.engine.cache;
import org.apache.iotdb.commons.utils.TestOnly;
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitor.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitor.java
index 08cf399f5aa..69c2c6bc638 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitor.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitor.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.engine.cache;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class CacheHitRatioMonitor implements CacheHitRatioMonitorMXBean,
IService {
- private static Logger logger =
LoggerFactory.getLogger(CacheHitRatioMonitor.class);
+ private static Logger LOGGER =
LoggerFactory.getLogger(CacheHitRatioMonitor.class);
static final CacheHitRatioMonitor instance =
AsyncCacheHitRatioHolder.DISPLAYER;
@Override
@@ -47,7 +48,7 @@ public class CacheHitRatioMonitor implements
CacheHitRatioMonitorMXBean, IServic
@Override
public void stop() {
JMXService.deregisterMBean(ServiceType.CACHE_HIT_RATIO_DISPLAY_SERVICE.getJmxName());
- logger.info("{}: stop {}...", IoTDBConstant.GLOBAL_DB_NAME,
this.getID().getName());
+ LOGGER.info("{}: stop {}...", IoTDBConstant.GLOBAL_DB_NAME,
this.getID().getName());
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitorMXBean.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitorMXBean.java
index 7cc5969f098..d6c9d8c70bc 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitorMXBean.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/CacheHitRatioMonitorMXBean.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.engine.cache;
public interface CacheHitRatioMonitorMXBean {
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index 823b47be2c8..723cd3c4c75 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -165,13 +165,11 @@ public class TimeSeriesMetadataCache {
BloomFilter bloomFilter =
BloomFilterCache.getInstance()
.get(new
BloomFilterCache.BloomFilterCacheKey(key.filePath), debug);
- if (bloomFilter != null) {
- if (!bloomFilter.contains(path.getFullPath())) {
- if (debug) {
- DEBUG_LOGGER.info("TimeSeries meta data {} is filter by
bloomFilter!", key);
- }
- return null;
+ if (bloomFilter != null &&
!bloomFilter.contains(path.getFullPath())) {
+ if (debug) {
+ DEBUG_LOGGER.info("TimeSeries meta data {} is filter by
bloomFilter!", key);
}
+ return null;
}
TsFileSequenceReader reader =
FileReaderManager.getInstance().get(key.filePath, true);
List<TimeseriesMetadata> timeSeriesMetadataList =
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesScanOperator.java
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesScanOperator.java
index 2a315920f2a..8719bed2e35 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesScanOperator.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesScanOperator.java
@@ -79,10 +79,6 @@ public class SeriesScanOperator extends
AbstractDataSourceOperator {
return sourceId;
}
- public PlanNodeId getPlanNodeId() {
- return sourceId;
- }
-
public String getOperatorType() {
return SeriesScanOperator.class.getSimpleName();
}
@@ -152,27 +148,13 @@ public class SeriesScanOperator extends
AbstractDataSourceOperator {
// here use do-while to promise doing this at least once
do {
/*
- * consume page data firstly
- */
- if (readPageData()) {
- continue;
- }
-
- /*
- * consume chunk data secondly
- */
- if (readChunkData()) {
- continue;
- }
-
- /*
- * consume next file finally
+ * 1. consume page data firstly
+ * 2. consume chunk data secondly
+ * 3. consume next file finally
*/
- if (readFileData()) {
- continue;
+ if (!readPageData() && !readChunkData() && !readFileData()) {
+ break;
}
- break;
-
} while (System.nanoTime() - start < maxRuntime && !builder.isFull());
finished = builder.isEmpty();
