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/08/21 02:12:39 UTC
[iotdb] branch gps51-013 created (now 566202fe64)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch gps51-013
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 566202fe64 delete limit concurrent for query
This branch includes the following new commits:
new 566202fe64 delete limit concurrent for query
The 1 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.
[iotdb] 01/01: delete limit concurrent for query
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch gps51-013
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 566202fe64a7047f729a9659731782fc9b8508b5
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Sun Aug 21 10:12:21 2022 +0800
delete limit concurrent for query
---
client-cpp/pom.xml | 4 ++--
compile-tools/pom.xml | 6 +++---
distribution/pom.xml | 2 +-
example/client-cpp-example/pom.xml | 2 +-
example/trigger/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
grafana-connector/pom.xml | 2 +-
integration/pom.xml | 6 +++---
jdbc/pom.xml | 2 +-
pom.xml | 8 ++++----
.../java/org/apache/iotdb/db/query/pool/QueryTaskManager.java | 5 +----
.../iotdb/db/query/pool/RawQueryReadTaskPoolManager.java | 10 ++--------
12 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml
index b6a0014588..38888eb4ba 100644
--- a/client-cpp/pom.xml
+++ b/client-cpp/pom.xml
@@ -116,8 +116,8 @@
<cmake.root.dir>${project.parent.basedir}/compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir>
<thrift.exec.absolute.path>${project.parent.basedir}/compile-tools/thrift/target/build/compiler/cpp/bin/${cmake.build.type}/thrift.exe</thrift.exec.absolute.path>
<iotdb.server.script>start-server.bat</iotdb.server.script>
- <boost.include.dir />
- <boost.library.dir />
+ <boost.include.dir/>
+ <boost.library.dir/>
</properties>
</profile>
<profile>
diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml
index fc4d80f6b3..afab6ff8d9 100644
--- a/compile-tools/pom.xml
+++ b/compile-tools/pom.xml
@@ -35,7 +35,7 @@
<cmake-version>3.17.3</cmake-version>
<openssl.include.dir>-Dtrue1=true1</openssl.include.dir>
<bison.executable.dir>-Dtrue1=true1</bison.executable.dir>
- <cmake.build.type />
+ <cmake.build.type/>
</properties>
<modules>
<module>thrift</module>
@@ -138,8 +138,8 @@
<thrift.make.executable>make</thrift.make.executable>
<thrift.compiler.executable>thrift.exe</thrift.compiler.executable>
<gradlew.executable>gradlew.bat</gradlew.executable>
- <boost.include.dir />
- <boost.library.dir />
+ <boost.include.dir/>
+ <boost.library.dir/>
</properties>
</profile>
</profiles>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 70dd54169d..c1aaa127ef 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>iotdb-distribution</artifactId>
<name>IoTDB Distribution</name>
- <modules />
+ <modules/>
<build>
<plugins>
<plugin>
diff --git a/example/client-cpp-example/pom.xml b/example/client-cpp-example/pom.xml
index 703f8fe8ad..9a5705cb36 100644
--- a/example/client-cpp-example/pom.xml
+++ b/example/client-cpp-example/pom.xml
@@ -84,7 +84,7 @@
<properties>
<cmake.generator>Visual Studio 16 2019</cmake.generator>
<cmake.root.dir>${project.parent.basedir}/../compile-tools/thrift/target/cmake-${cmake-version}-win64-x64/</cmake.root.dir>
- <boost.include.dir />
+ <boost.include.dir/>
</properties>
</profile>
<profile>
diff --git a/example/trigger/pom.xml b/example/trigger/pom.xml
index 64145c1682..1b16ca6041 100644
--- a/example/trigger/pom.xml
+++ b/example/trigger/pom.xml
@@ -118,7 +118,7 @@
<importOrder>
<order>org.apache.iotdb,,javax,java,\#</order>
</importOrder>
- <removeUnusedImports />
+ <removeUnusedImports/>
</java>
</configuration>
<executions>
diff --git a/example/udf/pom.xml b/example/udf/pom.xml
index f4d18b2510..4d26ff932f 100644
--- a/example/udf/pom.xml
+++ b/example/udf/pom.xml
@@ -118,7 +118,7 @@
<importOrder>
<order>org.apache.iotdb,,javax,java,\#</order>
</importOrder>
- <removeUnusedImports />
+ <removeUnusedImports/>
</java>
</configuration>
<executions>
diff --git a/grafana-connector/pom.xml b/grafana-connector/pom.xml
index 4a256ad502..91b7616d35 100644
--- a/grafana-connector/pom.xml
+++ b/grafana-connector/pom.xml
@@ -170,7 +170,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/integration/pom.xml b/integration/pom.xml
index 90deb1433d..d8e1e66f00 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -80,7 +80,7 @@
<id>LocalStandalone</id>
<properties>
<test.includedGroups>org.apache.iotdb.itbase.category.LocalStandaloneTest</test.includedGroups>
- <test.excludedGroups />
+ <test.excludedGroups/>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -142,7 +142,7 @@
<id>Remote</id>
<properties>
<test.includedGroups>org.apache.iotdb.itbase.category.RemoteTest</test.includedGroups>
- <test.excludedGroups />
+ <test.excludedGroups/>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@@ -206,7 +206,7 @@
<id>Cluster</id>
<properties>
<test.includedGroups>org.apache.iotdb.itbase.category.ClusterTest</test.includedGroups>
- <test.excludedGroups />
+ <test.excludedGroups/>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 12c6bd5dd4..5ad6473ddb 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -203,7 +203,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 0930fdcd7a..371b4c81cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
<sonar.junit.reportPaths>target/surefire-reports,target/failsafe-reports</sonar.junit.reportPaths>
<!-- By default, the argLine is empty-->
<gson.version>2.8.8</gson.version>
- <argLine />
+ <argLine/>
<!-- whether enable compiling the cpp client-->
<client-cpp>false</client-cpp>
<!-- disable enforcer by default-->
@@ -693,7 +693,7 @@
<importOrder>
<order>org.apache.iotdb,,javax,java,\#</order>
</importOrder>
- <removeUnusedImports />
+ <removeUnusedImports/>
</java>
<lineEndings>UNIX</lineEndings>
</configuration>
@@ -768,7 +768,7 @@
<phase>validate</phase>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -814,7 +814,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/pool/QueryTaskManager.java b/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
index f251e28fc9..44f8a7fa1c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
@@ -38,10 +38,7 @@ public class QueryTaskManager extends AbstractPoolManager {
private static final Logger LOGGER = LoggerFactory.getLogger(QueryTaskManager.class);
private QueryTaskManager() {
- int threadCnt =
- Math.min(
- Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread());
+ int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread();
pool = IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.QUERY_SERVICE.getName());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
index 56df13779f..4c75d2c64a 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
@@ -44,10 +44,7 @@ public class RawQueryReadTaskPoolManager extends AbstractPoolManager {
private static final Logger LOGGER = LoggerFactory.getLogger(RawQueryReadTaskPoolManager.class);
private RawQueryReadTaskPoolManager() {
- int threadCnt =
- Math.min(
- Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread());
+ int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread();
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
threadCnt, ThreadName.SUB_RAW_QUERY_SERVICE.getName());
@@ -94,10 +91,7 @@ public class RawQueryReadTaskPoolManager extends AbstractPoolManager {
@Override
public void start() {
if (pool == null) {
- int threadCnt =
- Math.min(
- Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread());
+ int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread();
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
threadCnt, ThreadName.SUB_RAW_QUERY_SERVICE.getName());