You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/11/23 10:05:11 UTC
[incubator-iotdb] branch rel/0.9 updated (96f4747 -> 40a9a51)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 96f4747 [IOTDB-308]switch jdk in travis from jdk8 to jdk11 (#574)
new e26cd34 get lock in FileReaderManager outside of the synchronized block (#582)
new 40a9a51 [maven-release-plugin] prepare release release/0.9.0
The 2 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:
client/pom.xml | 2 +-
distribution/pom.xml | 2 +-
example/hadoop/pom.xml | 6 ++---
example/jdbc/pom.xml | 2 +-
example/kafka/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
example/session/pom.xml | 2 +-
example/tsfile/pom.xml | 2 +-
grafana/pom.xml | 4 ++--
hadoop/pom.xml | 4 ++--
hive-connector/pom.xml | 6 ++---
jdbc/pom.xml | 4 ++--
pom.xml | 10 ++++-----
server/pom.xml | 2 +-
.../iotdb/db/query/control/FileReaderManager.java | 26 +++++++++++++---------
service-rpc/pom.xml | 4 ++--
session/pom.xml | 2 +-
spark-iotdb-connector/pom.xml | 2 +-
spark-tsfile/pom.xml | 4 ++--
tsfile/pom.xml | 2 +-
21 files changed, 48 insertions(+), 44 deletions(-)
[incubator-iotdb] 02/02: [maven-release-plugin] prepare release
release/0.9.0
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 40a9a5101dab42ef52642a469f305db17227ecd8
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 23 18:04:56 2019 +0800
[maven-release-plugin] prepare release release/0.9.0
---
client/pom.xml | 2 +-
distribution/pom.xml | 2 +-
example/hadoop/pom.xml | 6 +++---
example/jdbc/pom.xml | 2 +-
example/kafka/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
example/session/pom.xml | 2 +-
example/tsfile/pom.xml | 2 +-
grafana/pom.xml | 4 ++--
hadoop/pom.xml | 4 ++--
hive-connector/pom.xml | 6 +++---
jdbc/pom.xml | 4 ++--
pom.xml | 10 +++++-----
server/pom.xml | 2 +-
service-rpc/pom.xml | 4 ++--
session/pom.xml | 2 +-
spark-iotdb-connector/pom.xml | 2 +-
spark-tsfile/pom.xml | 4 ++--
tsfile/pom.xml | 2 +-
20 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index f806b76..0187b6c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-client</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 04c6537..da9e319 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-distribution</artifactId>
diff --git a/example/hadoop/pom.xml b/example/hadoop/pom.xml
index 907beab..7e56292 100644
--- a/example/hadoop/pom.xml
+++ b/example/hadoop/pom.xml
@@ -24,17 +24,17 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-example</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<name>hadoop-example</name>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</dependency>
</dependencies>
</project>
diff --git a/example/jdbc/pom.xml b/example/jdbc/pom.xml
index 41c962e..510ca30 100644
--- a/example/jdbc/pom.xml
+++ b/example/jdbc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jdbc-example</artifactId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index c777f3e..2732b0a 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index f7822a7..625af80 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 8508f8e..b1d993f 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/example/session/pom.xml b/example/session/pom.xml
index 006f392..3f7b71f 100644
--- a/example/session/pom.xml
+++ b/example/session/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-example</artifactId>
diff --git a/example/tsfile/pom.xml b/example/tsfile/pom.xml
index 7b0c792..910c71e 100644
--- a/example/tsfile/pom.xml
+++ b/example/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile-example</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 84f772d..7eec273 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
@@ -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/hadoop/pom.xml b/hadoop/pom.xml
index 6ffcc2b..008c800 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-tsfile</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index 9536e16..b99e860 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index bf7aa48..4b78b25 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
@@ -126,7 +126,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index 84fba25..03ad253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
@@ -42,7 +42,7 @@
<connection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</connection>
<developerConnection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</developerConnection>
<url>ssh://git@github.com:apache/incubator-iotdb.git</url>
- <tag>rel/0.8</tag>
+ <tag>release/0.9.0</tag>
</scm>
<modules>
<module>tsfile</module>
@@ -533,7 +533,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -579,7 +579,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>
@@ -727,7 +727,7 @@
<instrumentation>
<ignoreTrivial>true</ignoreTrivial>
</instrumentation>
- <check />
+ <check/>
</configuration>
<executions>
<execution>
diff --git a/server/pom.xml b/server/pom.xml
index b3f806f..eb04f57 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index c1df159..0b80960 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
@@ -100,7 +100,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
diff --git a/session/pom.xml b/session/pom.xml
index 9fd2090..14ae1cf 100644
--- a/session/pom.xml
+++ b/session/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>iotdb-session</artifactId>
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index 1797ede..3cbd474 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-iotdb-connector</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index e91cb96..fa7e1e8 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index e22a1c6..ce6232b 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
[incubator-iotdb] 01/02: get lock in FileReaderManager outside of
the synchronized block (#582)
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e26cd34de9de473fb2b1bad8bb993ef4ab081d60
Author: Jiang Tian <jt...@163.com>
AuthorDate: Sat Nov 23 17:33:47 2019 +0800
get lock in FileReaderManager outside of the synchronized block (#582)
(cherry picked from commit ed598fd71ad01987e006e56901162d6123d08843)
---
.../iotdb/db/query/control/FileReaderManager.java | 26 +++++++++++++---------
1 file changed, 15 insertions(+), 11 deletions(-)
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 c87c059..c961a64 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
@@ -164,25 +164,29 @@ public class FileReaderManager implements IService {
* Increase the reference count of the reader specified by filePath. Only when the reference count
* of a reader equals zero, the reader can be closed and removed.
*/
- synchronized void increaseFileReaderReference(TsFileResource tsFile, boolean isClosed) {
+ void increaseFileReaderReference(TsFileResource tsFile, boolean isClosed) {
// TODO : this should be called in get()
- if (!isClosed) {
- unclosedReferenceMap.computeIfAbsent(tsFile, k -> new AtomicInteger()).getAndIncrement();
- } else {
- closedReferenceMap.computeIfAbsent(tsFile, k -> new AtomicInteger()).getAndIncrement();
- }
tsFile.getWriteQueryLock().readLock().lock();
+ synchronized (this) {
+ if (!isClosed) {
+ unclosedReferenceMap.computeIfAbsent(tsFile, k -> new AtomicInteger()).getAndIncrement();
+ } else {
+ closedReferenceMap.computeIfAbsent(tsFile, k -> new AtomicInteger()).getAndIncrement();
+ }
+ }
}
/**
* Decrease the reference count of the reader specified by filePath. This method is latch-free.
* Only when the reference count of a reader equals zero, the reader can be closed and removed.
*/
- synchronized void decreaseFileReaderReference(TsFileResource tsFile, boolean isClosed) {
- if (!isClosed && unclosedReferenceMap.containsKey(tsFile)) {
- unclosedReferenceMap.get(tsFile).getAndDecrement();
- } else if (closedReferenceMap.containsKey(tsFile)){
- closedReferenceMap.get(tsFile).getAndDecrement();
+ void decreaseFileReaderReference(TsFileResource tsFile, boolean isClosed) {
+ synchronized (this) {
+ if (!isClosed && unclosedReferenceMap.containsKey(tsFile)) {
+ unclosedReferenceMap.get(tsFile).getAndDecrement();
+ } else if (closedReferenceMap.containsKey(tsFile)){
+ closedReferenceMap.get(tsFile).getAndDecrement();
+ }
}
tsFile.getWriteQueryLock().readLock().unlock();
}