You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ea...@apache.org on 2019/05/08 03:11:07 UTC

[incubator-iotdb] branch cluster_nodetool updated (d597914 -> 44a48aa)

This is an automated email from the ASF dual-hosted git repository.

east pushed a change to branch cluster_nodetool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from d597914  Merge remote-tracking branch 'origin/cluster' into cluster_nodetool
     add 07eb847  implement Query
     add 6c7b851  [IOTDB-74]fix that the damaged log will be skipped if it is the only log (#166)
     add 1b50cd0  supporting travis + win +jdk8
     add 30b36b7  Merge pull request #167 from xiaoyekanren/travis_jdk8_win
     add cfb16b2  close MemMonitor in  EnvironmentUtil.cleanEnv() (#164)
     add bb9b958  [IOTDB-76] Reformat MManager.getMetadataInString() in JSON format (#132)
     add 4f6aa05  Add disabled mem control & improve memory efficiency (#149)
     add 7c88b7d  [IOTDB-58] Replace list by array and refactor TsFileResource (#163)
     add 67647fa  release memory asap in ReadOnlyMemChunk
     add 0fb2a96  Merge pull request #111 from apache/fix_faster_release_mem
     add 1f13d9f   Fix a clerical error in console display when run 'start-server.sh' (#171)
     add 7675fc5  [IOTDB-84]fix in proper hashcode methods in processors (#169)
     add 4f554c7  Refactor query resource count (#168)
     add 1b9911e  merge master
     add 44a48aa  Merge remote-tracking branch 'origin/cluster' into cluster_nodetool

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |  27 ++-
 .../qp/executor/ClusterQueryProcessExecutor.java   |   4 +-
 .../coordinatornode/ClusterRpcQueryManager.java    |   2 +-
 .../iotdb/cluster/service/ClusterMonitorMBean.java |   2 +-
 .../iotdb/cluster/service/nodetool/Query.java      |   2 +-
 .../org/apache/iotdb/cluster/utils/RaftUtils.java  |   8 +-
 docs/Documentation/QuickStart.md                   |  74 +++----
 .../UserGuideV0.7.0/7-Tools-NodeTool.md            |  12 +-
 iotdb/iotdb/bin/nodetool.bat                       |   2 +-
 iotdb/iotdb/bin/nodetool.sh                        |   2 +-
 iotdb/iotdb/conf/iotdb-engine.properties           |   1 +
 iotdb/iotdb/conf/iotdb-env.sh                      |   2 +-
 .../java/org/apache/iotdb/db/engine/Processor.java |   2 +-
 .../engine/bufferwrite/BufferWriteProcessor.java   | 154 +++++++--------
 .../bufferwrite/RestorableTsFileIOWriter.java      |  19 +-
 .../iotdb/db/engine/filenode/FileNodeManager.java  |  40 ++--
 .../db/engine/filenode/FileNodeProcessor.java      | 173 ++++++++---------
 .../iotdb/db/engine/filenode/TsFileResource.java   | 216 ++++++++++++---------
 .../db/engine/memcontrol/BasicMemController.java   |   6 +-
 .../{Policy.java => DisabledMemController.java}    |  36 +++-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  14 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |   7 +-
 .../db/engine/memtable/IWritableMemChunk.java      |   2 +
 .../db/engine/memtable/MemTableFlushUtil.java      |  10 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  27 ++-
 .../db/engine/overflow/io/OverflowProcessor.java   | 113 +++++++----
 .../overflow/io/OverflowedTsFileIOWriter.java}     |  18 +-
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |   2 +
 .../db/exception/FileNodeProcessorException.java   |   4 +
 .../java/org/apache/iotdb/db/metadata/MGraph.java  |  11 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  14 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  11 +-
 .../db/qp/executor/IQueryProcessExecutor.java      |   4 +-
 .../iotdb/db/qp/executor/OverflowQPExecutor.java   |  18 +-
 .../iotdb/db/qp/executor/QueryProcessExecutor.java |   1 +
 .../iotdb/db/qp/logical/crud/InsertOperator.java   |  12 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |  25 +--
 .../db/qp/physical/transfer/CodecInstances.java    |  18 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |   8 +-
 .../db/query/control/QueryResourceManager.java     |   6 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   1 +
 .../iotdb/db/sync/receiver/SyncServiceImpl.java    |  91 ++++-----
 .../java/org/apache/iotdb/db/tools/WalChecker.java |  11 +-
 .../java/org/apache/iotdb/db/utils/MemUtils.java   |  24 +++
 .../apache/iotdb/db/writelog/io/RAFLogReader.java  |   3 +-
 .../writelog/manager/MultiFileLogNodeManager.java  |   1 +
 .../db/writelog/manager/WriteLogNodeManager.java   |   6 +-
 .../db/writelog/replay/ConcreteLogReplayer.java    |  12 +-
 .../bufferwrite/BufferWriteProcessorNewTest.java   |   1 -
 .../db/engine/filenode/TsFileResourceTest.java     |  12 +-
 .../engine/overflow/io/OverflowProcessorTest.java  |   2 +
 .../engine/overflow/io/OverflowResourceTest.java   |  24 +--
 .../transfer/PhysicalPlanLogTransferTest.java      |   2 +-
 .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java |   4 +-
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |  34 +++-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  10 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |  14 +-
 .../org/apache/iotdb/db/writelog/RecoverTest.java  |  12 +-
 .../iotdb/db/writelog/WriteLogNodeManagerTest.java |   8 +-
 .../apache/iotdb/db/writelog/WriteLogNodeTest.java |  25 +--
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |   8 +-
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |   4 +-
 .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java   |   2 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  13 +-
 .../iotdb/tsfile/write/TsFileReadWriteTest.java    |   4 +-
 65 files changed, 824 insertions(+), 613 deletions(-)
 copy iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/{Policy.java => DisabledMemController.java} (58%)
 copy iotdb/src/main/java/org/apache/iotdb/db/{writelog/io/ILogReader.java => engine/overflow/io/OverflowedTsFileIOWriter.java} (69%)