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 2022/01/18 06:03:59 UTC
[iotdb] branch TooManyOpenFiles updated (60ac6e2 -> 63e446b)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch TooManyOpenFiles
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 60ac6e2 [To debug] Add show query resource (#4871)
add 2659d1c [IOTDB-2423] Got an oom error when using iotdb (CQ?) (#4870)
new f1bde26 Merge remote-tracking branch 'origin/master' into TooManyOpenFiles
new f3931b6 Merge branch 'TooManyOpenFiles' of https://github.com/apache/iotdb into TooManyOpenFiles
new 63e446b add synchronize
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../main/java/org/apache/iotdb/db/query/control/FileReaderManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[iotdb] 02/03: Merge branch 'TooManyOpenFiles' of https://github.com/apache/iotdb into TooManyOpenFiles
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TooManyOpenFiles
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f3931b671f33815ce47023d75f994db581018473
Merge: f1bde26 60ac6e2
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jan 18 13:58:09 2022 +0800
Merge branch 'TooManyOpenFiles' of https://github.com/apache/iotdb into TooManyOpenFiles
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 4 ++
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +++-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 ++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 14 ++++++
.../org/apache/iotdb/db/qp/logical/Operator.java | 4 +-
.../qp/logical/sys/ShowQueryResourceOperate.java | 39 +++++++++++++++
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../db/qp/physical/sys/ShowQueryResourcePlan.java | 38 +++++++++++++++
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 56 ++++------------------
.../iotdb/db/query/control/FileReaderManager.java | 12 +++++
.../iotdb/db/query/control/QueryFileManager.java | 29 +++++++++++
.../db/query/control/QueryResourceManager.java | 4 ++
12 files changed, 164 insertions(+), 52 deletions(-)
[iotdb] 03/03: add synchronize
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TooManyOpenFiles
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 63e446b866ecab7bae41b0d44b260152d7105e6b
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jan 18 14:03:20 2022 +0800
add synchronize
---
pom.xml | 2 +-
.../main/java/org/apache/iotdb/db/query/control/FileReaderManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a293331..bf52818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<module>client-cpp</module>
<module>metrics</module>
<module>integration</module>
-<!-- <module>library-udf</module>-->
+ <!-- <module>library-udf</module>-->
</modules>
<!-- Properties Management -->
<properties>
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
index fb8f1bb..9be04e3 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
@@ -235,7 +235,7 @@ public class FileReaderManager {
|| (!isClosed && unclosedFileReaderMap.containsKey(tsFile.getTsFilePath()));
}
- public void writeFileReferenceInfo() {
+ public synchronized void writeFileReferenceInfo() {
DEBUG_LOGGER.info("[closedReferenceMap]\n");
for (Map.Entry<String, AtomicInteger> entry : closedReferenceMap.entrySet()) {
DEBUG_LOGGER.info(String.format("\t%s: %d\n", entry.getKey(), entry.getValue().get()));
[iotdb] 01/03: Merge remote-tracking branch 'origin/master' into TooManyOpenFiles
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TooManyOpenFiles
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f1bde265ab5c9d9f5eb0fda0e267f165c2e8258b
Merge: 2810e4f 2659d1c
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jan 18 13:41:57 2022 +0800
Merge remote-tracking branch 'origin/master' into TooManyOpenFiles
.../main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java | 3 +--
.../apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java | 3 +--
.../apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java | 5 ++---
.../org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java | 3 +--
4 files changed, 5 insertions(+), 9 deletions(-)