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

Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/12/28 15:51:25 UTC

[iotdb] branch restrict_memtable_11 updated (ff93f31 -> d8c751a)

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

haonan pushed a change to branch restrict_memtable_11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from ff93f31  fix review
     add a1ca00a  [To rel/0.11][IOTDB-1068] Fix Time series metadata cache bug (#2314)
     add bd9e4c3  save one rpc call
     add ec7668e  fix nullpointer bug
     add c2d5f2d  fix jdbc
     add 5afe292  [To rel/0.11] [IOTDB-1069] restrict the flushing memtable number to avoid OOM when mem_control is disabled  (#2317)
     add 116fca3  Revert "[To rel/0.11] [IOTDB-1069] restrict the flushing memtable number to avoid OOM when mem_control is disabled  (#2317)" (#2349)
     add 20bfeec  [To rel/0.11] Fix windows encoding bug (#2338)
     add 652154a  [ref/0.11] change merge recover to async (#2327)
     add d8c751a  Merge branch 'rel/0.11' of https://github.com/apache/iotdb into restrict_memtable_11

No new revisions were added by this update.

Summary of changes:
 .../src/assembly/resources/sbin/start-server.bat   |  4 +-
 .../db/engine/cache/TimeSeriesMetadataCache.java   | 25 ++++++----
 .../compaction/CompactionMergeTaskPoolManager.java |  3 +-
 .../db/engine/compaction/TsFileManagement.java     | 15 ++++++
 .../engine/storagegroup/StorageGroupProcessor.java | 56 ++++++++++++++--------
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  4 +-
 .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java |  2 +
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 34 +++++++++++++
 8 files changed, 110 insertions(+), 33 deletions(-)