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/08/19 06:36:10 UTC
[incubator-iotdb] branch dev_merge updated (d5280c5 -> 0e94676)
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 d5280c5 merge master
add f94d421 increase configuration parameters of cache
add 5e865b8 modify pr reviews
add 2028c1b Merge pull request #341 from apache/add_cache_configuration
add ac465f4 fix start-walchecker scripts for leting user define the wal folder
add 21bd10c add jmx interface for getting the active and pending tasks in FlushManager
add f40c076 add Apache header on FlushManagerMBean.java
add 3311fa0 deregister FlushManager MBean when stop
add f5c0dce merge two homogeneous interfaces (getNumberOfWorkingTasks() of FlushTask Pool)
add bdd129a delete duplicated function
add f718837 Merge pull request #319 from apache/feature_add_flush_queue_jmx_interface
add a83f7f3 add -e option for iotdb client
add 0c5243f fix apache license
add b573ba0 fix UT for unix
add 1a92040 fix apache license
add 1e09a2a Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 94bca89 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 9767bd2 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 4f1a928 Merge branch 'master' of https://github.com/apache/incubator-iotdb
add 4d8991a complete the doc for client -e parameter
add 2cc202e complete doc for Cli/Shell -e parameter
add 94eac46 fix apache license
add 1c83237 Merge pull request #301 from EJTTianYu/master
add 0e94676 Merge branch 'master' of github.com:apache/incubator-iotdb into dev_merge
No new revisions were added by this update.
Summary of changes:
client/src/assembly/resources/sbin/start-client.sh | 4 --
.../apache/iotdb/cli/client/AbstractClient.java | 46 ++++++++++++++++++-
.../java/org/apache/iotdb/cli/client/Client.java | 21 +++++++--
.../iotdb/cli/client/StartClientScriptIT.java | 3 +-
docs/Documentation-CHN/UserGuide/8-Tools-Cli.md | 51 +++++++++++++++++++++-
docs/Documentation/UserGuide/8-Tools-Cli.md | 41 ++++++++++++++++-
.../resources/conf/iotdb-engine.properties | 10 +++++
.../assembly/resources/tools/start-WalChecker.bat | 8 +++-
.../assembly/resources/tools/start-WalChecker.sh | 11 +++--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 40 ++++++++++++++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 31 +++++++++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 24 +++++++---
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 18 ++++++--
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 16 +++++++
.../apache/iotdb/db/engine/flush/FlushManager.java | 33 +++++++++++++-
.../iotdb/db/engine/flush/FlushManagerMBean.java | 16 ++++---
.../db/engine/flush/pool/AbstractPoolManager.java | 5 ++-
.../engine/flush/pool/FlushSubTaskPoolManager.java | 1 -
.../db/engine/flush/pool/FlushTaskPoolManager.java | 1 +
.../org/apache/iotdb/db/service/ServiceType.java | 9 +++-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
21 files changed, 350 insertions(+), 41 deletions(-)
mode change 100644 => 100755 server/src/assembly/resources/tools/start-WalChecker.sh
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java => server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManagerMBean.java (72%)