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 2020/06/12 08:38:46 UTC
[incubator-iotdb] branch acc_cache created (now 8b783cb)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch acc_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 8b783cb combine contains and get in cache
This branch includes the following new commits:
new 90c5a4d disable sync by default (#1325)
new 7766000 Merge remote-tracking branch 'origin/master'
new b6beda8 Merge remote-tracking branch 'origin/master'
new 8b783cb combine contains and get in cache
The 4 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.
[incubator-iotdb] 02/04: Merge remote-tracking branch
'origin/master'
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch acc_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 776600066a8cb2cf79cf9c61916ee02daef89473
Merge: 90c5a4d 8f87fd3
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Jun 11 16:28:50 2020 +0800
Merge remote-tracking branch 'origin/master'
README.md | 2 +-
README_ZH.md | 2 +-
docs/Development/VoteRelease.md | 2 +-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
docs/UserGuide/Server/Docker Image.md | 8 ++++----
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +-
.../Ecosystem Integration/Spark TsFile.md | 2 +-
docs/zh/UserGuide/Server/Docker Image.md | 8 ++++----
.../iotdb/db/metadata/mnode/InternalMNode.java | 23 +++++++++++++---------
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 ++
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 2 +-
service-rpc/rpc-changelist.md | 4 ++--
tsfile/format-changelist.md | 4 ++--
.../apache/iotdb/tsfile/utils/VersionUtils.java | 5 +++++
15 files changed, 41 insertions(+), 29 deletions(-)
[incubator-iotdb] 01/04: disable sync by default (#1325)
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch acc_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 90c5a4d843ed6deaa0ff03f51d01ae89735a26d3
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Mon Jun 8 16:01:27 2020 +0800
disable sync by default (#1325)
---
docs/zh/UserGuide/System Tools/Sync Tool.md | 2 +-
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/zh/UserGuide/System Tools/Sync Tool.md b/docs/zh/UserGuide/System Tools/Sync Tool.md
index bc85c05..242eb7d 100644
--- a/docs/zh/UserGuide/System Tools/Sync Tool.md
+++ b/docs/zh/UserGuide/System Tools/Sync Tool.md
@@ -71,7 +71,7 @@
</tr>
<tr>
<td>默认值</td>
- <td>true</td>
+ <td>false</td>
</tr>
<tr>
<td>改后生效方式</td>
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index bb78b41..846228c 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -341,8 +341,8 @@ external_sort_threshold = 1000
### Sync Server Configuration
####################
-# Whether to open the sync_server_port for receiving data from sync client, the default allowed
-is_sync_enable=true
+# Whether to open the sync_server_port for receiving data from sync client, the default is closed
+is_sync_enable=false
# Sync server port to listen
sync_server_port=5555
[incubator-iotdb] 03/04: Merge remote-tracking branch
'origin/master'
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch acc_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b6beda83508db690bddf63c2b871e09640dbef98
Merge: 7766000 2c4ab85
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 12 16:15:45 2020 +0800
Merge remote-tracking branch 'origin/master'
.../db/engine/storagegroup/TsFileResource.java | 4 +
.../org/apache/iotdb/db/metadata/MManager.java | 150 ++++++++++++++++++---
.../java/org/apache/iotdb/db/metadata/MTree.java | 14 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 5 +
.../db/writelog/recover/DeviceStringTest.java | 114 ++++++++++++++++
5 files changed, 258 insertions(+), 29 deletions(-)
[incubator-iotdb] 04/04: combine contains and get in cache
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch acc_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8b783cb265544d019e5d298cd78c2a1c8c318528
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 12 16:38:24 2020 +0800
combine contains and get in cache
---
.../apache/iotdb/db/engine/cache/ChunkCache.java | 21 +++++++--------------
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 11 +++++++----
.../db/engine/cache/TimeSeriesMetadataCache.java | 20 +++++++++++---------
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
index d9ef0a9..c3a6431 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
@@ -93,40 +93,33 @@ public class ChunkCache {
try {
lock.readLock().lock();
- if (lruCache.containsKey(chunkMetaData)) {
+ Chunk chunk = lruCache.get(chunkMetaData);
+ if (chunk != null) {
cacheHitNum.incrementAndGet();
printCacheLog(true);
- Chunk chunk = lruCache.get(chunkMetaData);
return new Chunk(chunk.getHeader(), chunk.getData().duplicate(), chunk.getDeletedAt());
}
} finally {
lock.readLock().unlock();
}
- Lock cacheLock = lock.writeLock();
+ lock.writeLock().lock();
try {
- cacheLock.lock();
- if (lruCache.containsKey(chunkMetaData)) {
- try {
- cacheLock = lock.readLock();
- cacheLock.lock();
- } finally {
- lock.writeLock().unlock();
- }
+ Chunk chunk = lruCache.get(chunkMetaData);
+ if (chunk != null) {
cacheHitNum.incrementAndGet();
printCacheLog(true);
- Chunk chunk = lruCache.get(chunkMetaData);
return new Chunk(chunk.getHeader(), chunk.getData().duplicate(), chunk.getDeletedAt());
}
printCacheLog(false);
- Chunk chunk = reader.readMemChunk(chunkMetaData);
+ chunk = reader.readMemChunk(chunkMetaData);
lruCache.put(chunkMetaData, chunk);
return new Chunk(chunk.getHeader(), chunk.getData().duplicate(), chunk.getDeletedAt());
} catch (IOException e) {
logger.error("something wrong happened while reading {}", reader.getFileName());
throw e;
} finally {
- cacheLock.unlock();
+ lock.writeLock().unlock();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
index 623dfec..8802cbf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
@@ -20,6 +20,7 @@ package org.apache.iotdb.db.engine.cache;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
@@ -131,10 +132,11 @@ public class ChunkMetadataCache {
lock.readLock().lock();
try {
- if (lruCache.containsKey(key)) {
+ List<ChunkMetadata> chunkMetadataList = lruCache.get(key);
+ if (chunkMetadataList != null) {
cacheHitNum.incrementAndGet();
printCacheLog(true);
- return new ArrayList<>(lruCache.get(key));
+ return new ArrayList<>(chunkMetadataList);
}
} finally {
lock.readLock().unlock();
@@ -142,10 +144,11 @@ public class ChunkMetadataCache {
lock.writeLock().lock();
try {
- if (lruCache.containsKey(key)) {
+ List<ChunkMetadata> chunkMetadataList = lruCache.get(key);
+ if (chunkMetadataList != null) {
printCacheLog(true);
cacheHitNum.incrementAndGet();
- return new ArrayList<>(lruCache.get(key));
+ return new ArrayList<>(chunkMetadataList);
}
printCacheLog(false);
// bloom filter part
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index aa3a846..c80eed6 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -114,10 +114,11 @@ public class TimeSeriesMetadataCache {
try {
lock.readLock().lock();
- if (lruCache.containsKey(key)) {
+ TimeseriesMetadata timeseriesMetadata = lruCache.get(key);
+ if (timeseriesMetadata != null) {
cacheHitNum.incrementAndGet();
printCacheLog(true);
- return new TimeseriesMetadata(lruCache.get(key));
+ return new TimeseriesMetadata(timeseriesMetadata);
}
} finally {
lock.readLock().unlock();
@@ -125,10 +126,11 @@ public class TimeSeriesMetadataCache {
try {
lock.writeLock().lock();
- if (lruCache.containsKey(key)) {
+ TimeseriesMetadata tsMetadata = lruCache.get(key);
+ if (tsMetadata != null) {
cacheHitNum.incrementAndGet();
printCacheLog(true);
- return new TimeseriesMetadata(lruCache.get(key));
+ return new TimeseriesMetadata(tsMetadata);
}
printCacheLog(false);
// bloom filter part
@@ -141,14 +143,14 @@ public class TimeSeriesMetadataCache {
List<TimeseriesMetadata> timeSeriesMetadataList = reader
.readTimeseriesMetadata(key.device, allSensors);
// put TimeSeriesMetadata of all sensors used in this query into cache
- timeSeriesMetadataList.forEach(timeseriesMetadata ->
+ timeSeriesMetadataList.forEach(t ->
lruCache.put(new TimeSeriesMetadataCacheKey(key.filePath, key.device,
- timeseriesMetadata.getMeasurementId()), timeseriesMetadata));
- TimeseriesMetadata metadata = lruCache.get(key);
- if (metadata == null) {
+ t.getMeasurementId()), t));
+ tsMetadata = lruCache.get(key);
+ if (tsMetadata == null) {
return null;
} else {
- return new TimeseriesMetadata(metadata);
+ return new TimeseriesMetadata(tsMetadata);
}
} catch (IOException e) {
logger.error("something wrong happened while reading {}", key.filePath);