[iotdb] branch rel/0.11 updated: [To rel/0.11] Change Query debug log for deletion and last (#2846)

[ha...@apache.org]

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

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


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new fd35f16  [To rel/0.11] Change Query debug log for deletion and last (#2846)
fd35f16 is described below

commit fd35f16de51631a6d065262c1e4c3988822bd583
Author: wshao08 <59...@users.noreply.github.com>
AuthorDate: Tue Mar 16 14:10:09 2021 +0800

    [To rel/0.11] Change Query debug log for deletion and last (#2846)
    
    Co-authored-by: Xiangdong Huang <hu...@tsinghua.edu.cn>
    Co-authored-by: Haonan <hh...@outlook.com>
---
 .../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java  | 2 +-
 .../java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java   | 6 ------
 .../java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java  | 1 +
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 41f5b2e..344f914 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1524,7 +1524,6 @@ public class StorageGroupProcessor {
       for (PartialPath device : devicePaths) {
         // delete Last cache record if necessary
         tryToDeleteLastCache(device, path, startTime, endTime);
-        DEBUG_LOGGER.info("Delete last cache for path: " + path + " with deletion interval: " + startTime + " to " + endTime);
       }
 
       // write log to impacted working TsFileProcessors
@@ -1633,6 +1632,7 @@ public class StorageGroupProcessor {
           if (lastPair != null && startTime <= lastPair.getTimestamp()
               && lastPair.getTimestamp() <= endTime) {
             ((MeasurementMNode) measurementNode).resetCache();
+            logger.info("[tryToDeleteLastCache] Last cache for path: {} is set to null", measurementNode.getFullPath());
           }
         }
       }
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java
index a4b0ad5..24e1092 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/MeasurementMNode.java
@@ -29,8 +29,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.iotdb.tsfile.read.TimeValuePair;
 import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Represents an MNode which has a Measurement or Sensor attached to it.
@@ -38,7 +36,6 @@ import org.slf4j.LoggerFactory;
 public class MeasurementMNode extends MNode {
 
   private static final long serialVersionUID = -1199657856921206435L;
-  private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
 
   /**
    * measurement's Schema for one timeseries represented by current leaf node
@@ -86,14 +83,12 @@ public class MeasurementMNode extends MNode {
       if (!highPriorityUpdate || latestFlushedTime <= timeValuePair.getTimestamp()) {
         cachedLastValuePair =
             new TimeValuePair(timeValuePair.getTimestamp(), timeValuePair.getValue());
-        DEBUG_LOGGER.info("[MeasurementMNode] Last cache for path: " + fullPath + " is set to: " + timeValuePair.getTimestamp());
       }
     } else if (timeValuePair.getTimestamp() > cachedLastValuePair.getTimestamp()
         || (timeValuePair.getTimestamp() == cachedLastValuePair.getTimestamp()
         && highPriorityUpdate)) {
       cachedLastValuePair.setTimestamp(timeValuePair.getTimestamp());
       cachedLastValuePair.setValue(timeValuePair.getValue());
-      DEBUG_LOGGER.info("[MeasurementMNode] Last cache for path: " + fullPath + " is set to: " + timeValuePair.getTimestamp());
     }
   }
 
@@ -104,7 +99,6 @@ public class MeasurementMNode extends MNode {
 
   public void resetCache() {
     cachedLastValuePair = null;
-    DEBUG_LOGGER.info("[MeasurementMNode] Last cache for path: " + fullPath + " is set to null");
   }
 
   public long getOffset() {
diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
index 527109d..7360a18 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java
@@ -187,6 +187,7 @@ public class LastQueryExecutor {
       TimeValuePair tvPair = cacheAccessors.get(i).read();
       if (tvPair != null) {
         resultContainer.add(new Pair<>(true, tvPair));
+        DEBUG_LOGGER.info("[LastQueryExecutor] Last cache hit for path: {} with timestamp: {}" , seriesPaths.get(i), tvPair.getTimestamp());
       } else {
         resultContainer.add(new Pair<>(false, null));
         restPaths.add(seriesPaths.get(i));