You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/12/31 07:53:08 UTC
[iotdb] branch virtual_partition_2_merge updated (57d93c6 ->
83a906c)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch virtual_partition_2_merge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 57d93c6 Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge
add 8bf4746 Remove useless imports in python client (#2294)
add 3192cda change the table format of md doc in spark module (#2393)
add 84d7527 fix coordinator not init bug after restart (#2383)
add 886b99d Add check local nodes in partitiontable's all nodes or not when restart the cluster
add 8966bf1 Merge pull request #2391 from neuyilan/apache_master_1230_fix_restart_bug
add af1da9d [IOTDB-1069] restrict the flushing memtable number to avoid OOM when mem_control is disabled (#2315)
new 83a906c Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/iotdb/cluster/ClusterMain.java | 20 +++-
.../iotdb/cluster/coordinator/Coordinator.java | 4 +-
.../iotdb/cluster/server/MetaClusterServer.java | 6 +-
.../cluster/server/member/MetaGroupMember.java | 3 +-
.../cluster/server/member/MetaGroupMemberTest.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 +++
.../engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../db/engine/storagegroup/TsFileProcessor.java | 19 +++-
.../org/apache/iotdb/db/metadata/MManager.java | 8 ++
.../apache/iotdb/db/rescon/MemTableManager.java | 116 +++++++++++++++++++++
.../org/apache/iotdb/db/rescon/SystemInfo.java | 1 +
spark-iotdb-connector/Readme.md | 32 +++---
spark-tsfile/README.md | 31 +++---
13 files changed, 208 insertions(+), 50 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into virtual_partition_2_merge
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch virtual_partition_2_merge
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 83a906ce05c210a10176b9f7be538b50bfd178a6
Merge: 57d93c6 af1da9d
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Thu Dec 31 15:52:24 2020 +0800
Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge
.../java/org/apache/iotdb/cluster/ClusterMain.java | 20 +++-
.../iotdb/cluster/coordinator/Coordinator.java | 4 +-
.../iotdb/cluster/server/MetaClusterServer.java | 6 +-
.../cluster/server/member/MetaGroupMember.java | 3 +-
.../cluster/server/member/MetaGroupMemberTest.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 +++
.../engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../db/engine/storagegroup/TsFileProcessor.java | 19 +++-
.../org/apache/iotdb/db/metadata/MManager.java | 8 ++
.../apache/iotdb/db/rescon/MemTableManager.java | 116 +++++++++++++++++++++
.../org/apache/iotdb/db/rescon/SystemInfo.java | 1 +
spark-iotdb-connector/Readme.md | 32 +++---
spark-tsfile/README.md | 31 +++---
13 files changed, 208 insertions(+), 50 deletions(-)