You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/24 11:39:05 UTC
[incubator-iotdb] branch dev_merge updated (d1795ef -> 0e7977d)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d1795ef add MergePathSelector
add 695d514 reconstruct flush pool class
add 9816b20 add cli query flush info
add 2da000a add build module
add c1a1e11 remove antrun plugin
add 6f8cf76 add apache rat for build/*.xml
add 70dd773 set the version in build/pom.xml as 0.9.0-SNAPSHOT
add 1f15530 Merge pull request #296 from apache/cherry-pick-build-module-from-0.8
add 0e7977d Merge branch 'master' into dev_merge
No new revisions were added by this update.
Summary of changes:
.gitignore | 2 -
{example/rocketmq => build}/pom.xml | 48 +++++-----
build/src/main/resources/distribution.xml | 80 ++++++++++++++++
client/pom.xml | 33 -------
pom.xml | 1 +
server/pom.xml | 38 --------
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +
.../{storagegroup => flush}/FlushManager.java | 33 +++++--
.../{memtable => flush}/MemTableFlushTask.java | 7 +-
.../{memtable => flush}/NotifyFlushMemTable.java | 5 +-
.../pool/AbstractPoolManager.java} | 68 ++++++--------
.../engine/flush/pool/FlushSubTaskPoolManager.java | 79 ++++++++++++++++
.../db/engine/flush/pool/FlushTaskPoolManager.java | 77 +++++++++++++++
.../iotdb/db/engine/memtable/AbstractMemTable.java | 3 +-
.../iotdb/db/engine/pool/FlushPoolManager.java | 104 ---------------------
.../db/engine/storagegroup/TsFileProcessor.java | 19 ++--
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/ServiceType.java | 7 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 29 +++++-
.../iotdb/db/tools/MemEst/MemEstToolCmd.java | 6 +-
.../writelog/recover/TsFileRecoverPerformer.java | 2 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 1 +
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
23 files changed, 381 insertions(+), 269 deletions(-)
copy {example/rocketmq => build}/pom.xml (56%)
create mode 100644 build/src/main/resources/distribution.xml
rename server/src/main/java/org/apache/iotdb/db/engine/{storagegroup => flush}/FlushManager.java (70%)
rename server/src/main/java/org/apache/iotdb/db/engine/{memtable => flush}/MemTableFlushTask.java (97%)
rename server/src/main/java/org/apache/iotdb/db/engine/{memtable => flush}/NotifyFlushMemTable.java (85%)
rename server/src/main/java/org/apache/iotdb/db/engine/{pool/FlushSubTaskPoolManager.java => flush/pool/AbstractPoolManager.java} (53%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushSubTaskPoolManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java