You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by li...@apache.org on 2019/11/21 11:00:38 UTC

[incubator-iotdb] 02/03: Merge branch 'master' into monitor

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

liurui pushed a commit to branch monitor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 82ddd8d2d392eeefcaec083f9b47c14aa170f4cc
Merge: 5ff75da def4daf
Author: liuruiyiyang <24...@qq.com>
AuthorDate: Thu Nov 21 16:39:08 2019 +0800

    Merge branch 'master' into monitor

 .mvn/wrapper/MavenWrapperDownloader.java           |  60 +++++----
 LICENSE                                            |   7 +
 server/pom.xml                                     |   5 +
 .../db/conf/adapter/ActiveTimeSeriesCounter.java   | 146 +++++++++++++++++++++
 .../db/conf/adapter/IActiveTimeSeriesCounter.java  |  61 +++++++++
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   4 +
 .../db/engine/storagegroup/TsFileProcessor.java    |  25 +---
 .../org/apache/iotdb/db/metadata/MManager.java     |   3 +
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  14 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  12 +-
 .../conf/adapter/ActiveTimeSeriesCounterTest.java  | 122 +++++++++++++++++
 .../db/conf/adapter/CompressionRatioTest.java      |   2 -
 .../iotdb/db/conf/adapter/HyperLogLogTest.java     |  65 +++++++++
 .../adapter/IoTDBConfigDynamicAdapterTest.java     |  24 ++--
 .../db/engine/cache/DeviceMetaDataCacheTest.java   |   2 +
 .../db/engine/memtable/MemTableFlushTaskTest.java  |   2 +
 .../storagegroup/StorageGroupProcessorTest.java    |   2 +
 .../iotdb/db/query/reader/ReaderTestHelper.java    |   2 +
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |   2 +
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   3 +
 spark-iotdb-connector/pom.xml                      |   6 +
 21 files changed, 506 insertions(+), 63 deletions(-)