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/02/23 07:22:02 UTC

[incubator-iotdb] branch mmanager_refactor updated (2a56213 -> a4dfa1a)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch mmanager_refactor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 2a56213  Fix TSFHiveInputFormatTest.testGetSplits
     add 4dc7261  fix bugs that file is not closed in
     add 396771c  move an error log to info log.(resourceLogger)
     add 90c513c  merge with ut_close_socket
     add b1dbcb3  enable mergeLog for checking why merging is hanged
     add ed7b548  try to set stoptime as 0 to accelerate MetrcsService close
     add 487850d  try to solve the bug 'if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup' in TsFileProcessor syncFlush()
     add 78bf351  try to solve the bug 'if the flushing thread is too fast, the tmpMemTable.wait() may never wakeup' in TsFileProcessor syncFlush() 2
     add 2f2e1e0  debug why 8181 is not closed
     add a87d9e4  [IOTDB-510][IOTDB-501]Fix nullPointException bug in TsProcessor (#831)
     add aae1f14  [IOTDB-492] Remove unused field from hadoop example
     add 086173e  [IOTDB-493] Remove author tags from source code
     add a1a56ef  (feat)Update RocketMQ Readme file
     add 0155009  [IOTDB-503] Add checkTimeseriesExists for session
     add 59cba45  [IOTDB-502] NPE bug in `org.apache.iotdb.db.service.TSServiceImpl`
     add 3ded47f  add TsFileFilter (#828)
     add 9570e2a  resolve conflict after merging master
     add 4aa9ff3  fix sonar bug and smell
     add 77a01a5  add license
     add f96fafd  add some test
     add f0e59f1  add header
     add 40c19d2  Merge pull request #713 from apache/new_series_reader
     add 101149d  resolve conflict after merging master
     add a4dfa1a  resolve confilct

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |   3 +
 .travis.yml                                        |   2 +-
 .../iotdb/hadoop/tsfile/TSFMRReadExample.java      |   3 -
 .../iotdb/hadoop/tsfile/TSMRWriteExample.java      |   1 -
 example/rocketmq/readme.md                         |  22 +--
 .../main/java/org/apache/iotdb/SessionExample.java |  12 +-
 .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java |   3 -
 .../iotdb/hadoop/tsfile/TSFOutputFormat.java       |   3 -
 .../iotdb/hadoop/tsfile/TSFRecordReader.java       |   3 -
 .../iotdb/hadoop/tsfile/record/HDFSTSRecord.java   |   3 -
 .../iotdb/hadoop/tsfile/TSFInputSplitTest.java     |   2 -
 .../apache/iotdb/hive/TsFileDeserializerTest.java  |   3 -
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  11 ++
 .../apache/iotdb/db/engine/flush/FlushManager.java |  33 +++-
 .../iotdb/db/engine/merge/manage/MergeManager.java |  11 ++
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   6 +-
 .../db/engine/storagegroup/TsFileProcessor.java    | 212 ++++++++++++++-------
 ...imeException.java => JDBCServiceException.java} |  14 +-
 .../db/qp/physical/crud/AlignByDevicePlan.java     |   6 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  10 +-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |   2 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |   2 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |   2 +-
 .../db/query/executor/AggregationExecutor.java     |   6 +-
 .../db/query/executor/RawDataQueryExecutor.java    |   4 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   2 +-
 .../filter/TsFileFilter.java}                      |  16 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |   2 -
 .../query/reader/series/SeriesAggregateReader.java |   5 +-
 .../reader/series/SeriesRawDataBatchReader.java    |   5 +-
 .../reader/series/SeriesRawDataPointReader.java    |  15 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |   5 +-
 .../reader/series/SeriesReaderByTimestamp.java     |   5 +-
 .../query/timegenerator/ServerTimeGenerator.java   |   2 +-
 .../org/apache/iotdb/db/service/JDBCService.java   |   5 +-
 .../apache/iotdb/db/service/MetricsService.java    |   5 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   9 +-
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |  14 ++
 .../db/engine/cache/DeviceMetaDataCacheTest.java   |   4 +-
 .../storagegroup/StorageGroupProcessorTest.java    |   1 +
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   2 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |  50 ++---
 .../iotdb/db/integration/IoTDBMergeTest.java       |   3 +
 .../reader/series/SeriesAggregateReaderTest.java   |   2 +-
 .../reader/series/SeriesReaderByTimestampTest.java |   2 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   3 +
 server/src/test/resources/logback.xml              |   2 +
 .../java/org/apache/iotdb/session/Session.java     |   9 +
 .../iotdb/tsfile/read/common/SignalBatchData.java  |   5 +
 .../read/query/timegenerator/TimeGenerator.java    |   7 +-
 .../org/apache/iotdb/tsfile/utils/PublicBAOS.java  |  13 --
 .../apache/iotdb/tsfile/read/ExpressionTest.java   |  60 ++++++
 .../iotdb/tsfile/read/common/BatchDataTest.java    |  11 ++
 .../tsfile/read/query/timegenerator/NodeTest.java  |   8 +
 .../query/timegenerator/TimeGeneratorTest.java     |   3 +-
 .../iotdb/tsfile/utils/TsFileGeneratorForTest.java |  56 +-----
 .../iotdb/tsfile/utils/TsPrimitiveTypeTest.java    |  60 ++++++
 57 files changed, 504 insertions(+), 266 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/exception/runtime/{FlushRunTimeException.java => JDBCServiceException.java} (74%)
 copy server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IFileQueryMemMeasurement.java => query/filter/TsFileFilter.java} (74%)
 create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java
 create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsPrimitiveTypeTest.java