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/10/29 03:05:40 UTC
[incubator-iotdb] branch dev_TTL updated (d995fb4 -> 949f1ef)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_TTL
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from d995fb4 fix show null ttl
add 5dcb366 [IOTDB-198]Reimplementation sync module (#372)
add 949f1ef Merge branch 'master' into dev_TTL
No new revisions were added by this update.
Summary of changes:
.../UserGuide/9-System Tools/1-Sync Tool.md | 58 +-
.../9-System Tools/2-Memory Estimation Tool.md | 4 +-
.../UserGuide/9-System Tools/1-Sync Tool.md | 85 ++-
.../9-System Tools/2-Memory Estimation Tool.md | 4 +-
.../resources/conf/iotdb-engine.properties | 8 -
.../resources/conf/iotdb-sync-client.properties | 16 +-
server/src/assembly/resources/conf/logback.xml | 20 +
.../assembly/resources/tools/start-sync-client.bat | 2 +-
.../assembly/resources/tools/start-sync-client.sh | 2 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 -
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 -
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 8 +-
.../db/conf/directories/DirectoryManager.java | 8 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 15 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 32 +-
.../engine/storagegroup/StorageGroupProcessor.java | 309 +++++++--
.../db/engine/storagegroup/TsFileResource.java | 4 +
....java => SyncDeviceOwnerConflictException.java} | 13 +-
.../org/apache/iotdb/db/metadata/MManager.java | 4 +-
.../iotdb/db/query/control/FileReaderManager.java | 13 +
.../universal/CachedPriorityMergeReader.java | 26 +-
.../reader/universal/PriorityMergeReader.java | 2 +-
.../sync/conf/{Constans.java => SyncConstant.java} | 50 +-
.../iotdb/db/sync/conf/SyncSenderConfig.java | 145 ++--
.../iotdb/db/sync/conf/SyncSenderDescriptor.java | 53 +-
.../org/apache/iotdb/db/sync/package-info.java | 39 ++
.../iotdb/db/sync/receiver/SyncServerManager.java | 17 +-
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 740 ---------------------
.../iotdb/db/sync/receiver/load/FileLoader.java | 234 +++++++
.../db/sync/receiver/load/FileLoaderManager.java | 215 ++++++
.../iotdb/db/sync/receiver/load/IFileLoader.java | 60 ++
.../iotdb/db/sync/receiver/load/ILoadLogger.java | 62 ++
.../iotdb/db/sync/receiver/load/LoadLogger.java | 72 ++
.../iotdb/db/sync/receiver/load/LoadType.java | 8 +-
.../recover/ISyncReceiverLogAnalyzer.java} | 16 +-
.../receiver/recover/ISyncReceiverLogger.java} | 39 +-
.../receiver/recover/SyncReceiverLogAnalyzer.java | 153 +++++
.../sync/receiver/recover/SyncReceiverLogger.java | 72 ++
.../db/sync/receiver/transfer/SyncServiceImpl.java | 304 +++++++++
.../iotdb/db/sync/sender/SyncFileManager.java | 208 ------
.../apache/iotdb/db/sync/sender/SyncSender.java | 75 ---
.../iotdb/db/sync/sender/SyncSenderImpl.java | 545 ---------------
.../db/sync/sender/manage/ISyncFileManager.java | 67 ++
.../db/sync/sender/manage/SyncFileManager.java | 198 ++++++
.../sender/recover/ISyncSenderLogAnalyzer.java | 52 ++
.../db/sync/sender/recover/ISyncSenderLogger.java | 65 ++
.../sync/sender/recover/SyncSenderLogAnalyzer.java | 128 ++++
.../db/sync/sender/recover/SyncSenderLogger.java | 72 ++
.../sync/sender/transfer/DataTransferManager.java | 667 +++++++++++++++++++
.../sync/sender/transfer/IDataTransferManager.java | 104 +++
.../java/org/apache/iotdb/db/utils/SyncUtils.java | 40 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 1 -
.../iotdb/db/engine/merge/MergeOverLapTest.java | 151 +++++
.../apache/iotdb/db/engine/merge/MergeTest.java | 21 +-
.../storagegroup/FileNodeManagerBenchmark.java | 2 +-
.../db/sync/receiver/load/FileLoaderTest.java | 330 +++++++++
.../recover/SyncReceiverLogAnalyzerTest.java | 212 ++++++
.../receiver/recover/SyncReceiverLoggerTest.java | 112 ++++
.../db/sync/sender/MultipleClientSyncTest.java | 226 -------
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 559 ----------------
.../iotdb/db/sync/sender/SyncFileManagerTest.java | 374 -----------
.../db/sync/sender/manage/SyncFileManagerTest.java | 295 ++++++++
.../sender/recover/SyncSenderLogAnalyzerTest.java | 163 +++++
.../sync/sender/recover/SyncSenderLoggerTest.java | 111 ++++
.../sender/transfer/DataTransferManagerTest.java | 140 ++++
.../apache/iotdb/db/sync/test/SyncTestClient1.java | 253 -------
.../apache/iotdb/db/sync/test/SyncTestClient2.java | 262 --------
.../apache/iotdb/db/sync/test/SyncTestClient3.java | 282 --------
.../java/org/apache/iotdb/db/sync/test/Utils.java | 44 --
.../iotdb/db/{sync/test => utils}/RandomNum.java | 2 +-
service-rpc/src/main/thrift/sync.thrift | 22 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 1 +
74 files changed, 4778 insertions(+), 3942 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/exception/{FlushRunTimeException.java => SyncDeviceOwnerConflictException.java} (73%)
rename server/src/main/java/org/apache/iotdb/db/sync/conf/{Constans.java => SyncConstant.java} (59%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/package-info.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/load/FileLoader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/load/IFileLoader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/load/ILoadLogger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/load/LoadLogger.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java => server/src/main/java/org/apache/iotdb/db/sync/receiver/load/LoadType.java (89%)
copy server/src/main/java/org/apache/iotdb/db/{query/reader/IPointReader.java => sync/receiver/recover/ISyncReceiverLogAnalyzer.java} (68%)
copy server/src/main/java/org/apache/iotdb/db/{engine/modification/io/ModificationWriter.java => sync/receiver/recover/ISyncReceiverLogger.java} (54%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/manage/ISyncFileManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/recover/ISyncSenderLogAnalyzer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/recover/ISyncSenderLogger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/IDataTransferManager.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLoggerTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLoggerTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManagerTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
rename server/src/test/java/org/apache/iotdb/db/{sync/test => utils}/RandomNum.java (98%)