You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2019/07/09 15:14:01 UTC
[incubator-iotdb] branch feature_query_cache updated (48968a8 ->
7332aa8)
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a change to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 48968a8 add cache in TsFileMetaData
add 69ddf0a fix TsFileProcessor syncClose always waiting bug
add e622d59 fix review comment
add 0d99c0f fix boolean check bug
add ca61a7a fix TVListAllocatorMBean bug, move the interface and implementation to the same package
add f7ad470 update config
add 34272a7 update doc
add 17b1a7e adjust tsfile threshold to close and update doc
new 7722289 Merge remote-tracking branch 'origin/feature_async_close_tsfile' into feature_query_cache
add b88fa61 fix system memory check in iotdb-env.sh
add 35fc676 set the hadoop-module logback level as info
add 044fcce Merge branch 'master' into fix_memorycheck_in_startsh
add 10e4b4e Merge pull request #211 from apache/fix_memorycheck_in_startsh
add b15ebc5 a small grammar mistake
add fe39d33 Merge pull request #218 from Genius-pig/master
add 3a16bd5 New Storage Engine (#217)
add a62d329 Separate documents into different chapter folders
add a294b48 Merge pull request #204 from samperson1997/master
add 0fbda87 add IOTDB_HOME prefix to dir (#220)
add 77da29b fix unclosed broken file (#223)
add 92c46cb Tsfile write example revised (#224)
add 2df04b1 rename a class and modify some comments (#221)
add d5c7f55 Package name added for example TsFileWrite (#225)
add d7a9e35 [IOTDB-123] Add documents in Chinese and fix links in English documents (#219)
new c4d9b7b merge master
add 7e9f543 catch exception to find broken tsfile
add 88227ee print error info in detail
new 7332aa8 Merge remote-tracking branch 'origin/hash_map_with_fix_length' into feature_query_cache
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:
docs/Development.md | 12 +
.../Frequently asked questions.md} | 7 +-
.../OtherMaterial-Examples.md | 7 +-
.../OtherMaterial-Reference.md | 7 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md} | 4 +-
docs/Documentation-CHN/QuickStart.md | 290 ++++++++++++
.../UserGuideV0.7.0/1-Overview/1-What is IoTDB.md} | 7 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 ++
.../UserGuideV0.7.0/1-Overview/3-Scenario.md | 78 ++++
.../UserGuideV0.7.0/1-Overview/4-Features.md | 51 +++
.../1-Key Concepts and Terminology.md | 179 ++++++++
.../2-Data Type.md | 34 ++
.../3-Encoding.md | 63 +++
.../4-Compression.md | 28 ++
.../3-Operation Manual/1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 118 +++++
.../3-Operation Manual/3-Data Import.md | 85 ++++
.../3-Operation Manual/4-Data Query.md | 508 +++++++++++++++++++++
.../3-Operation Manual/5-Data Maintenance.md | 83 ++++
.../3-Operation Manual/6-Priviledge Management.md | 134 ++++++
.../4-Deployment and Management/1-Deployment.md | 99 ++++
.../4-Deployment and Management/2-Configuration.md | 414 +++++++++++++++++
.../3-System Monitor.md | 152 ++++++
.../4-Deployment and Management/4-System log.md | 64 +++
.../5-Data Management.md | 74 +++
.../6-Build and use IoTDB by Dockerfile.md} | 4 +-
.../1-IoTDB Query Statement.md} | 233 ++--------
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ++++++
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} | 4 +-
.../UserGuideV0.7.0/7-Tools-Cli.md | 77 ++++
.../UserGuideV0.7.0/7-Tools-Grafana.md | 118 +++++
.../UserGuideV0.7.0/7-Tools-Hadoop.md} | 4 +-
.../UserGuideV0.7.0/7-Tools-spark.md} | 4 +-
.../Documentation/UserGuideV0.7.0/0-Content.md | 30 +-
.../1-What is IoTDB.md} | 9 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 ++
.../{1-Overview.md => 1-Overview/3-Scenario.md} | 42 --
.../UserGuideV0.7.0/1-Overview/4-Features.md | 33 ++
.../1-Key Concepts and Terminology.md} | 75 +--
.../2-Data Type.md | 38 ++
.../3-Encoding.md | 62 +++
.../4-Compression.md | 28 ++
.../1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 115 +++++
.../3-Operation Manual/3-Data Import.md | 87 ++++
.../4-Data Query.md} | 395 +---------------
.../3-Operation Manual/5-Data Maintenance.md | 82 ++++
.../3-Operation Manual/6-Priviledge Management.md | 124 +++++
.../UserGuideV0.7.0/4-Deployment and Management.md | 196 ++++----
.../4-Deployment and Management/1-Deployment.md | 169 +++++++
.../4-Deployment and Management/2-Configuration.md | 329 +++++++++++++
.../3-System Monitor.md | 359 +++++++++++++++
.../4-Deployment and Management/4-System log.md | 66 +++
.../5-Data Management.md | 77 ++++
.../6-Build and use IoTDB by Dockerfile.md | 92 ++++
.../1-IoTDB Query Statement.md} | 129 ------
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ++++++
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} | 4 +-
{iotdb => hadoop}/src/test/resources/logback.xml | 0
iotdb/iotdb/conf/iotdb-engine.properties | 37 +-
iotdb/iotdb/conf/iotdb-env.sh | 6 +-
iotdb/iotdb/conf/tsfile-format.properties | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 44 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +-
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 10 +-
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 1 +
.../db/engine/memtable/PrimitiveMemTable.java | 2 +-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../org/apache/iotdb/db/monitor/IStatistic.java | 2 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 4 +-
.../monitor/collector/MemTableWriteTimeCost.java | 3 +
.../qp/executor/AbstractQueryProcessExecutor.java | 6 +-
.../iotdb/db/query/executor/EngineExecutor.java | 4 +
.../reader/sequence/SequenceSeriesReader.java | 1 -
.../sequence/SequenceSeriesReaderByTimestamp.java | 6 +-
...ava => FileSeriesReaderByTimestampAdapter.java} | 4 +-
.../{engine/memtable => rescon}/MemTablePool.java | 4 +-
.../datastructure => rescon}/TVListAllocator.java | 17 +-
.../TVListAllocatorMBean.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../writelog/recover/TsFileRecoverPerformer.java | 24 +-
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 1 +
.../db/engine/memtable/MemtableBenchmark.java | 1 -
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 6 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 6 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 6 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 6 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 6 +-
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 6 +-
tsfile/example/readme.md | 39 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +-
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 236 ++++++----
.../iotdb/tsfile/common/conf/TSFileConfig.java | 11 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 12 +-
.../iotdb/tsfile/read/controller/ChunkLoader.java | 6 +
.../tsfile/read/controller/ChunkLoaderImpl.java | 3 +
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../reader/series/FileSeriesReaderWithFilter.java | 28 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 +-
.../tsfile/write/schema/MeasurementSchema.java | 4 +-
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 4 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 2 +-
.../read/query/executor/QueryExecutorTest.java | 2 +-
.../query/timegenerator/ReaderByTimestampTest.java | 2 +-
.../query/timegenerator/TimeGeneratorTest.java | 2 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 6 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 2 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 6 +-
110 files changed, 5258 insertions(+), 1206 deletions(-)
copy docs/{Documentation/UserGuideV0.7.0/6-JDBC Documentation.md => Documentation-CHN/Frequently asked questions.md} (90%)
copy docs/{Documentation => Documentation-CHN}/OtherMaterial-Examples.md (83%)
copy docs/{Documentation => Documentation-CHN}/OtherMaterial-Reference.md (73%)
copy docs/{Community-History&Vision.md => Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md} (95%)
create mode 100755 docs/Documentation-CHN/QuickStart.md
rename docs/{Documentation/UserGuideV0.7.0/6-JDBC Documentation.md => Documentation-CHN/UserGuideV0.7.0/1-Overview/1-What is IoTDB.md} (72%)
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/2-Architecture.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/3-Scenario.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/4-Features.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/1-Key Concepts and Terminology.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/2-Data Type.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/3-Encoding.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/4-Compression.md
copy docs/{Documentation/UserGuideV0.7.0/7-Tools-Hadoop.md => Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/1-Sample Data.md} (70%)
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/6-Priviledge Management.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/4-System log.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/5-Data Management.md
copy docs/{Community-History&Vision.md => Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/6-Build and use IoTDB by Dockerfile.md} (94%)
copy docs/{Documentation/UserGuideV0.7.0/5-SQL Documentation.md => Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md} (71%)
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/2-Reference.md
copy docs/{Community-History&Vision.md => Documentation-CHN/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} (96%)
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/7-Tools-Cli.md
create mode 100644 docs/Documentation-CHN/UserGuideV0.7.0/7-Tools-Grafana.md
copy docs/{Community-History&Vision.md => Documentation-CHN/UserGuideV0.7.0/7-Tools-Hadoop.md} (94%)
copy docs/{Community-History&Vision.md => Documentation-CHN/UserGuideV0.7.0/7-Tools-spark.md} (94%)
copy hadoop/README.md => docs/Documentation/UserGuideV0.7.0/0-Content.md (56%)
copy docs/Documentation/UserGuideV0.7.0/{7-Tools-Hadoop.md => 1-Overview/1-What is IoTDB.md} (62%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/1-Overview/2-Architecture.md
rename docs/Documentation/UserGuideV0.7.0/{1-Overview.md => 1-Overview/3-Scenario.md} (66%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/1-Overview/4-Features.md
rename docs/Documentation/UserGuideV0.7.0/{2-Concept.md => 2-Concept Key Concepts and Terminology/1-Key Concepts and Terminology.md} (60%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/2-Data Type.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/3-Encoding.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/2-Concept Key Concepts and Terminology/4-Compression.md
copy docs/Documentation/UserGuideV0.7.0/{7-Tools-Hadoop.md => 3-Operation Manual/1-Sample Data.md} (57%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
rename docs/Documentation/UserGuideV0.7.0/{3-Operation Manual.md => 3-Operation Manual/4-Data Query.md} (52%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/3-Operation Manual/6-Priviledge Management.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/4-System log.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/5-Data Management.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/6-Build and use IoTDB by Dockerfile.md
rename docs/Documentation/UserGuideV0.7.0/{5-SQL Documentation.md => 5-IoTDB SQL Documentation/1-IoTDB Query Statement.md} (85%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/5-IoTDB SQL Documentation/2-Reference.md
copy docs/{Community-History&Vision.md => Documentation/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} (96%)
copy {iotdb => hadoop}/src/test/resources/logback.xml (100%)
copy iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/adapter/{SeriesReaderByTimestampAdapter.java => FileSeriesReaderByTimestampAdapter.java} (89%)
rename iotdb/src/main/java/org/apache/iotdb/db/{engine/memtable => rescon}/MemTablePool.java (95%)
rename iotdb/src/main/java/org/apache/iotdb/db/{utils/datastructure => rescon}/TVListAllocator.java (83%)
rename iotdb/src/main/java/org/apache/iotdb/db/{utils/datastructure => rescon}/TVListAllocatorMBean.java (94%)
[incubator-iotdb] 03/03: Merge remote-tracking branch
'origin/hash_map_with_fix_length' into feature_query_cache
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 7332aa859df20af4532cceb9000a98180ae7afc9
Merge: c4d9b7b 88227ee
Author: suyue <23...@qq.com>
AuthorDate: Tue Jul 9 23:13:31 2019 +0800
Merge remote-tracking branch 'origin/hash_map_with_fix_length' into feature_query_cache
.../iotdb/tsfile/read/controller/ChunkLoader.java | 6 +++++
.../tsfile/read/controller/ChunkLoaderImpl.java | 3 +++
.../reader/series/FileSeriesReaderWithFilter.java | 28 +++++++++++++++-------
3 files changed, 29 insertions(+), 8 deletions(-)
[incubator-iotdb] 02/03: merge master
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit c4d9b7b43048ae94dc707fa3b047858a17154062
Merge: 7722289 d7a9e35
Author: suyue <23...@qq.com>
AuthorDate: Tue Jul 9 23:12:55 2019 +0800
merge master
docs/Development.md | 12 +
.../Frequently asked questions.md} | 7 +-
docs/Documentation-CHN/OtherMaterial-Examples.md | 83 ++++
docs/Documentation-CHN/OtherMaterial-Reference.md | 31 ++
.../OtherMaterial-ReleaseNotesV0.7.0.md} | 7 +-
docs/Documentation-CHN/QuickStart.md | 290 ++++++++++++
.../UserGuideV0.7.0/1-Overview/1-What is IoTDB.md} | 7 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 ++
.../UserGuideV0.7.0/1-Overview/3-Scenario.md | 78 ++++
.../UserGuideV0.7.0/1-Overview/4-Features.md | 51 +++
.../1-Key Concepts and Terminology.md | 179 ++++++++
.../2-Data Type.md | 34 ++
.../3-Encoding.md | 63 +++
.../4-Compression.md | 28 ++
.../3-Operation Manual/1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 118 +++++
.../3-Operation Manual/3-Data Import.md | 85 ++++
.../3-Operation Manual/4-Data Query.md | 508 +++++++++++++++++++++
.../3-Operation Manual/5-Data Maintenance.md | 83 ++++
.../3-Operation Manual/6-Priviledge Management.md | 134 ++++++
.../4-Deployment and Management/1-Deployment.md | 99 ++++
.../4-Deployment and Management/2-Configuration.md | 414 +++++++++++++++++
.../3-System Monitor.md | 152 ++++++
.../4-Deployment and Management/4-System log.md | 64 +++
.../5-Data Management.md | 74 +++
.../6-Build and use IoTDB by Dockerfile.md} | 7 +-
.../1-IoTDB Query Statement.md} | 233 ++--------
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ++++++
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} | 7 +-
.../UserGuideV0.7.0/7-Tools-Cli.md | 77 ++++
.../UserGuideV0.7.0/7-Tools-Grafana.md | 118 +++++
.../UserGuideV0.7.0/7-Tools-Hadoop.md} | 7 +-
.../UserGuideV0.7.0/7-Tools-spark.md} | 7 +-
.../{6-JDBC Documentation.md => 0-Content.md} | 35 +-
.../1-What is IoTDB.md} | 7 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 ++
.../{1-Overview.md => 1-Overview/3-Scenario.md} | 42 --
.../UserGuideV0.7.0/1-Overview/4-Features.md | 33 ++
.../1-Key Concepts and Terminology.md} | 75 +--
.../2-Data Type.md | 38 ++
.../3-Encoding.md | 62 +++
.../4-Compression.md | 28 ++
.../1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 115 +++++
.../3-Operation Manual/3-Data Import.md | 87 ++++
.../4-Data Query.md} | 395 +---------------
.../3-Operation Manual/5-Data Maintenance.md | 82 ++++
.../3-Operation Manual/6-Priviledge Management.md | 124 +++++
.../4-Deployment and Management/1-Deployment.md | 169 +++++++
.../4-Deployment and Management/2-Configuration.md | 329 +++++++++++++
.../3-System Monitor.md | 359 +++++++++++++++
.../4-Deployment and Management/4-System log.md | 66 +++
.../5-Data Management.md | 77 ++++
.../6-Build and use IoTDB by Dockerfile.md | 92 ++++
.../1-IoTDB Query Statement.md} | 129 ------
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ++++++
.../1-JDBC API.md} | 7 +-
hadoop/src/test/resources/logback.xml | 41 ++
iotdb/iotdb/conf/iotdb-env.sh | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 39 ++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 4 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 6 +-
.../iotdb/db/query/executor/EngineExecutor.java | 4 +
.../reader/sequence/SequenceSeriesReader.java | 1 -
.../sequence/SequenceSeriesReaderByTimestamp.java | 6 +-
.../FileSeriesReaderByTimestampAdapter.java | 46 ++
.../writelog/recover/TsFileRecoverPerformer.java | 24 +-
tsfile/example/readme.md | 39 +-
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 236 ++++++----
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
70 files changed, 5225 insertions(+), 997 deletions(-)
diff --cc iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
index 1598afc,994622a..a7a8270
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
@@@ -58,15 -53,17 +58,15 @@@ public class DeviceMetaDataCache
}
/**
-- * get {@link TsDeviceMetadata}. THREAD SAFE.
++ * get {@link ChunkMetaData}. THREAD SAFE.
*/
- public TsDeviceMetadata get(String filePath, String deviceId, TsFileMetaData fileMetaData)
+ public List<ChunkMetaData> get(String filePath, Path seriesPath)
throws IOException {
- // The key(the tsfile path and deviceId) for the lruCache
- String jointPath = filePath + deviceId;
- Object jointPathObject = jointPath.intern();
+ Object jointPathObject = filePath.intern();
synchronized (lruCache) {
cacheRequestNum.incrementAndGet();
- if (lruCache.containsKey(jointPath)) {
+ if (lruCache.containsKey(filePath) && lruCache.get(filePath).containsKey(seriesPath)) {
cacheHintNum.incrementAndGet();
if (logger.isDebugEnabled()) {
logger.debug(
@@@ -137,4 -111,57 +137,4 @@@
private static final DeviceMetaDataCache INSTANCE = new
DeviceMetaDataCache(CACHE_SIZE);
}
-
- /**
- * This class is a map used to cache the <code>RowGroupBlockMetaData</code>. The caching strategy
- * is LRU.
- *
- */
- private class LruLinkedHashMap extends LinkedHashMap<String, TsDeviceMetadata> {
-
- private static final long serialVersionUID = 1290160928914532649L;
- private static final float LOAD_FACTOR_MAP = 0.75f;
- private int maxCapacity;
-
- public LruLinkedHashMap(int maxCapacity, boolean isLru) {
- super(maxCapacity, LOAD_FACTOR_MAP, isLru);
- this.maxCapacity = maxCapacity;
- }
-
- @Override
- protected boolean removeEldestEntry(Map.Entry<String, TsDeviceMetadata> eldest) {
- return size() > maxCapacity;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- return super.equals(o);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- DeviceMetaDataCache that = (DeviceMetaDataCache) o;
- return Objects.equals(lruCache, that.lruCache) &&
- Objects.equals(cacheHintNum, that.cacheHintNum) &&
- Objects.equals(cacheRequestNum, that.cacheRequestNum);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(lruCache, cacheHintNum, cacheRequestNum);
- }
--}
++}
diff --cc iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
index 8d75065,65e476a..d853a6a
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
@@@ -65,8 -65,6 +65,7 @@@ public abstract class AbstractQueryProc
private QueryDataSet processDataQuery(QueryPlan queryPlan, QueryContext context)
throws StorageEngineException, QueryFilterOptimizationException, PathErrorException, ProcessorException, IOException {
- QueryExpression queryExpression = QueryExpression.create().setSelectSeries(queryPlan.getPaths())
- .setExpression(queryPlan.getExpression());
++
if (queryPlan instanceof GroupByPlan) {
GroupByPlan groupByPlan = (GroupByPlan) queryPlan;
return groupBy(groupByPlan.getPaths(), groupByPlan.getAggregations(),
@@@ -84,6 -82,8 +83,9 @@@
return fill(queryPlan.getPaths(), fillQueryPlan.getQueryTime(),
fillQueryPlan.getFillType(), context);
}
++
+ QueryExpression queryExpression = QueryExpression.create().setSelectSeries(queryPlan.getPaths())
+ .setExpression(queryPlan.getExpression());
return queryRouter.query(queryExpression, context);
}
diff --cc iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
index 0203e6b,ca6e7aa..cdc3306
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
@@@ -40,7 -40,7 +40,11 @@@ import org.apache.iotdb.tsfile.read.fil
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
/**
++<<<<<<< HEAD
+ * IoTDB query executor of Stand-alone version with global time filter.
++=======
+ * IoTDB query executor.
++>>>>>>> origin/master
*/
public class EngineExecutor {
diff --cc iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReader.java
index b68ab53,da4571e..94842b0
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReader.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReader.java
@@@ -33,7 -32,7 +33,6 @@@ import org.apache.iotdb.tsfile.read.TsF
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.controller.ChunkLoader;
import org.apache.iotdb.tsfile.read.controller.ChunkLoaderImpl;
--import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReader;
import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReaderWithFilter;
diff --cc iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReaderByTimestamp.java
index 8fdecc7,8aa61c9..dee48a6
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReaderByTimestamp.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReaderByTimestamp.java
@@@ -19,7 -19,6 +19,8 @@@
package org.apache.iotdb.db.query.reader.sequence;
++
+import org.apache.iotdb.db.engine.cache.DeviceMetaDataCache;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.query.context.QueryContext;
@@@ -32,7 -31,7 +33,6 @@@ import org.apache.iotdb.tsfile.read.TsF
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.controller.ChunkLoader;
import org.apache.iotdb.tsfile.read.controller.ChunkLoaderImpl;
--import org.apache.iotdb.tsfile.read.controller.MetadataQuerierByFileImpl;
import org.apache.iotdb.tsfile.read.reader.series.FileSeriesReaderByTimestamp;
import java.io.IOException;
[incubator-iotdb] 01/03: Merge remote-tracking branch
'origin/feature_async_close_tsfile' into feature_query_cache
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 772228973381fd2d1f8aeaa04093f51365210b6f
Merge: 48968a8 17b1a7e
Author: suyue <23...@qq.com>
AuthorDate: Tue Jul 9 22:32:05 2019 +0800
Merge remote-tracking branch 'origin/feature_async_close_tsfile' into feature_query_cache
.../UserGuideV0.7.0/4-Deployment and Management.md | 196 +++++++++------------
iotdb/iotdb/conf/iotdb-engine.properties | 37 ++--
iotdb/iotdb/conf/iotdb-env.sh | 4 +-
iotdb/iotdb/conf/tsfile-format.properties | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 5 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 10 +-
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 1 +
.../db/engine/memtable/PrimitiveMemTable.java | 2 +-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../org/apache/iotdb/db/monitor/IStatistic.java | 2 +-
.../apache/iotdb/db/monitor/MonitorConstants.java | 4 +-
.../monitor/collector/MemTableWriteTimeCost.java | 3 +
.../{engine/memtable => rescon}/MemTablePool.java | 4 +-
.../datastructure => rescon}/TVListAllocator.java | 17 +-
.../TVListAllocatorMBean.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 1 +
.../db/engine/memtable/MemtableBenchmark.java | 1 -
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 6 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 6 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 6 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 6 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 6 +-
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 6 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 11 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 12 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../tsfile/write/schema/MeasurementSchema.java | 4 +-
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 4 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 2 +-
.../read/query/executor/QueryExecutorTest.java | 2 +-
.../query/timegenerator/ReaderByTimestampTest.java | 2 +-
.../query/timegenerator/TimeGeneratorTest.java | 2 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 6 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 2 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 6 +-
40 files changed, 198 insertions(+), 211 deletions(-)