You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/03 19:49:02 UTC
[iotdb] 02/05: merge with master
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c49b1fdf5ac51df855a070cb090432268cfbecd7
Merge: 1aa771e 3606aaa
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:27:16 2020 +0800
merge with master
RELEASE_NOTES.md | 71 ++++++++++++++++
client-py/src/Session.py | 9 +-
.../{TsFileManagement.md => Compaction.md} | 49 +++++------
.../resources/conf/iotdb-engine.properties | 67 +++++++--------
.../org/apache/iotdb/db/concurrent/ThreadName.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 95 +++++++++-------------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 19 ++---
.../CompactionMergeTaskPoolManager.java} | 32 ++++----
.../CompactionStrategy.java} | 20 ++---
.../TsFileManagement.java | 41 +++++-----
.../level/LevelCompactionTsFileManagement.java} | 79 ++++++++----------
.../no/NoCompactionTsFileManagement.java} | 10 +--
.../utils/CompactionLogAnalyzer.java} | 18 ++--
.../utils/CompactionLogger.java} | 12 +--
.../utils/CompactionUtils.java} | 54 ++++--------
.../iotdb/db/engine/merge/manage/MergeManager.java | 17 ----
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 44 +++++-----
.../org/apache/iotdb/db/metadata/MManager.java | 22 +++++
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 +-
.../org/apache/iotdb/db/service/ServiceType.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +-
.../iotdb/db/engine/merge/MergePerfTest.java | 2 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 6 +-
.../db/integration/IoTDBDeleteTimeseriesIT.java | 10 +--
.../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 10 +--
.../db/integration/IoTDBRemovePartitionIT.java | 2 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 12 +--
31 files changed, 372 insertions(+), 356 deletions(-)
diff --cc client-py/src/Session.py
index 9fcc2f9,c8dd51d..93579ce
--- a/client-py/src/Session.py
+++ b/client-py/src/Session.py
@@@ -18,8 -18,10 +18,9 @@@
import sys
import struct
+ import time
-# sys.path.append("../target")
-sys.path.append("../../thrift/target/generated-sources-python")
+#sys.path.append("../../thrift/target/generated-sources-python")
sys.path.append("./utils")
from IoTDBConstants import *