You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/06/07 04:54:14 UTC
[iotdb] branch LogQueryMemoryControl updated: add more logs
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch LogQueryMemoryControl
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/LogQueryMemoryControl by this push:
new b244c79 add more logs
b244c79 is described below
commit b244c7900d6751762b677f819fc7dec641997c26
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Mon Jun 7 12:53:50 2021 +0800
add more logs
---
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 6 +++---
.../apache/iotdb/db/query/control/QueryResourceManager.java | 10 ++++++----
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/grafana/pom.xml b/grafana/pom.xml
index fe4785a..8637ca5 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -165,7 +165,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 51d0b20..c7cd2df 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -223,7 +223,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 8ba7f2d..c3a7b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<!-- By default, the argLine is empty-->
<gson.version>2.8.6</gson.version>
- <argLine />
+ <argLine/>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -603,7 +603,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -649,7 +649,7 @@
</requireJavaVersion>
<!-- Disabled for now as it breaks the ability to build single modules -->
<!--reactorModuleConvergence/-->
- <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" />
+ <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
</rules>
</configuration>
</execution>
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
index 5c96197..26c5fb5 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
@@ -137,13 +137,15 @@ public class QueryResourceManager {
if (totalFreeMemoryForRead.addAndGet(-estimatedMemoryUsage) >= 0) {
queryIdEstimatedMemoryMap.put(queryId, estimatedMemoryUsage);
logger.info(
- "query id {}, sql is {}, apply the memory successfully, used {} memory, left {} memory",
- queryId, sql, estimatedMemoryUsage, totalFreeMemoryForRead.get());
+ "query id {}, sql is {}, apply the memory successfully, deduplicatedPathNum is {}, fetchSize is {}, used {} memory, left {} memory",
+ queryId, sql, deduplicatedPathNum, fetchSize, estimatedMemoryUsage,
+ totalFreeMemoryForRead.get());
} else {
totalFreeMemoryForRead.addAndGet(estimatedMemoryUsage);
logger.info(
- "query id {}, sql is {}, apply the memory failed, used {} memory, left {} memory",
- queryId, sql, estimatedMemoryUsage, totalFreeMemoryForRead.get());
+ "query id {}, sql is {}, apply the memory failed, deduplicatedPathNum is {}, fetchSize is {}, used {} memory, left {} memory",
+ queryId, sql, deduplicatedPathNum, fetchSize, estimatedMemoryUsage,
+ totalFreeMemoryForRead.get());
}
}
}