You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/03/13 09:29:01 UTC
[incubator-iotdb] branch cherry_pick_cluster_2 updated (ed1ac34 ->
215197e)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cherry_pick_cluster_2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ed1ac34 extract get series type in TSServiceImpl
add 6ba8aa8 Fix a NPE when concat filter with multiple devices (#900)
add 74f1eb9 Release query resource while exception happened in query producer thread (#903)
add 2f61528 fix timegenerator cache bug (#905)
add 215197e Merge branch 'master' into cherry_pick_cluster_2
No new revisions were added by this update.
Summary of changes:
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 9 +-
.../engine/storagegroup/StorageGroupProcessor.java | 51 +++---
.../dataset/RawQueryDataSetWithoutValueFilter.java | 45 +++--
.../db/query/executor/RawDataQueryExecutor.java | 10 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 15 +-
.../ExceptionBatchData.java} | 18 +-
.../read/query/timegenerator/TimeGenerator.java | 7 +-
.../read/query/timegenerator/node/LeafNode.java | 38 +++--
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
.../apache/iotdb/tsfile/write/ReadWriteTest.java | 180 ++++++++++++++++++++
.../tsfile/write/TimeGeneratorReadEmptyTest.java | 141 ++++++++++++++++
.../tsfile/write/TimeGeneratorReadWriteTest.java | 182 +++++++++++++++++++++
12 files changed, 616 insertions(+), 82 deletions(-)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/{filter/factory/FilterType.java => common/ExceptionBatchData.java} (67%)
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadWriteTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/write/TimeGeneratorReadEmptyTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/write/TimeGeneratorReadWriteTest.java