[incubator-iotdb] branch master updated (85d3bf9 -> def4daf)

[li...@apache.org]

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

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


    from 85d3bf9  cherry pick from rel/0.9
     add 73c3261  feat(ActiveTimeSeriesCounter): add ActiveTimeSeriesCounter for memtableSize estimation
     add 3ff7e94  fix(IoTDB): fix StatMonitor launch failure
     add 393d56b  test(ActiveTimeSeriesCounterTest): add ActiveTimeSeriesCounterTest
     add 2056cf0  test(HyperLogLogTest): add HyperLogLogTest
     add c47967e  Merge branch 'master' into dynamic_config
     add 83af4f0  chore(ActiveTimeSeriesCounter): change log level
     add e4e527f  Merge branch 'master' into dynamic_config
     add 1b4e5e6  test(*): modify test class to avoid ActiveTimeSeriesCounter exceptions
     add 888e44d  Merge branch 'master' into dynamic_config
     add 854dfa1  fix(pom): fix spark-iotdb-connector pom dependency conflict
     add cec35ac  fix(ActiveTimeSeriesCounter): add exception control
     add 48ea26b  fix(ActiveTimeSeriesCounter): update when active time series number changed
     add f004628  fix(ActiveTimeSeriesCounter): fix PR comment
     add 8e7861f  fix(ActiveTimeSeriesCounter): fix exception control when delete storage group
     add def4daf  Merge pull request #560 from apache/dynamic_config

No new revisions were added by this update.

Summary of changes:
 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 +-
 .../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 +
 18 files changed, 452 insertions(+), 38 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/conf/adapter/ActiveTimeSeriesCounter.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/conf/adapter/IActiveTimeSeriesCounter.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/conf/adapter/ActiveTimeSeriesCounterTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/conf/adapter/HyperLogLogTest.java