You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/10/22 12:52:06 UTC
[incubator-iotdb] 03/03: resolve conflict when merge pr450
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch new_doc_pr
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f3666550ae9cdcdd0eb0cf35a9e1f80ea473882d
Merge: 5adfcbb 5634843
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Oct 22 20:50:28 2019 +0800
resolve conflict when merge pr450
README.md | 4 +-
.../5-Management/2-Performance Monitor.md | 4 +-
docs/Documentation/Developers/release.adoc | 519 +++++
.../5-Management/2-Performance Monitor.md | 7 +-
.../UserGuide/9-Tools-spark-tsfile.md | 18 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +
pom.xml | 45 +-
.../resources/conf/iotdb-engine.properties | 25 +
server/src/assembly/resources/conf/iotdb-env.sh | 6 +-
server/src/assembly/resources/conf/logback.xml | 2 +-
.../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g | 222 ---
.../org/apache/iotdb/db/sql/parse/TSParser.g | 914 ---------
.../org/apache/iotdb/db/sql/parse/TqlLexer.g | 540 +++++
.../org/apache/iotdb/db/sql/parse/TqlParser.g | 737 +++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 96 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 12 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 83 +
.../engine/cache/CacheHitRatioMonitorMXBean.java | 26 +
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 36 +-
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 37 +-
.../iotdb/db/exception/StorageGroupException.java | 41 +
.../java/org/apache/iotdb/db/metadata/MGraph.java | 18 +-
.../org/apache/iotdb/db/metadata/MManager.java | 132 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 61 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 3 +-
.../org/apache/iotdb/db/qp/QueryProcessor.java | 3 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 5 +-
...SParserConstant.java => TqlParserConstant.java} | 37 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 96 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 434 ++--
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 1 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/ServiceType.java | 8 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 5 +-
.../org/apache/iotdb/db/sql/parse/AstNode.java | 4 +-
.../org/apache/iotdb/db/sql/parse/ParseDriver.java | 12 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 56 +
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 3 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 3 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 5 +-
.../engine/modification/DeletionFileNodeTest.java | 5 +-
.../db/engine/modification/DeletionQueryTest.java | 5 +-
.../storagegroup/FileNodeManagerBenchmark.java | 6 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 26 +-
.../db/integration/IoTDBAutoCreateSchemaIT.java | 156 ++
.../org/apache/iotdb/db/metadata/MGraphTest.java | 3 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 10 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 68 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 23 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 19 +-
.../org/apache/iotdb/db/metadata/MetadataTest.java | 3 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 2 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 20 +
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 6 +-
.../org/apache/iotdb/db/sql/SQLParserTest.java | 2077 --------------------
.../org/apache/iotdb/db/sql/TqlParserTest.java | 1874 ++++++++++++++++++
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 53 +
.../apache/iotdb/db/writelog/PerformanceTest.java | 3 +-
tools/check_sigs.sh | 67 +
tools/clean-site.sh | 35 +
tools/common.sh | 202 ++
tools/download_staged_release.sh | 143 ++
63 files changed, 5411 insertions(+), 3673 deletions(-)
diff --cc docs/Documentation-CHN/UserGuide/5-Management/2-Performance Monitor.md
index 0e07619,7c6a9d1..52206aa
--- a/docs/Documentation-CHN/UserGuide/5-Management/2-Performance Monitor.md
+++ b/docs/Documentation-CHN/UserGuide/5-Management/2-Performance Monitor.md
@@@ -66,14 -70,14 +66,14 @@@
在监控开始区域增加计时代码:
- long t0 = System. currentTimeMillis();
-
+ long t0 = System. currentTimeMillis();
-
在监控结束区域增加记录代码:
- Measurement.INSTANCE.addOperationLatency(Operation, t0);
- Measurement.INSTANCE.addOperationLatency(Operation, t0);
++ Measurement.INSTANCE.addOperationLatency(Operation, t0);
## cache命中率统计
++
### 概述
为了提高查询性能，IOTDB对ChunkMetaData和TsFileMetaData进行了缓存。用户可以通过debug级别的日志以及MXBean两种方式来查看缓存的命中率，并根据缓存命中率以及系统内存来调节缓存所使用的内存大小。使用MXBean查看缓存命中率的方法为：
diff --cc docs/Documentation/UserGuide/5-Management/2-Performance Monitor.md
index b0b00c1,28f6170..dfb80e9
--- a/docs/Documentation/UserGuide/5-Management/2-Performance Monitor.md
+++ b/docs/Documentation/UserGuide/5-Management/2-Performance Monitor.md
@@@ -19,8 -19,8 +19,10 @@@
-->
-# Chapter 4: Deployment and Management
+# Chapter 5: Management
++
## Performance Monitor
++
### Introduction
In order to grasp the performance of iotdb, we add this module to count the time-consuming of each operation. This module can statistic the avg time-consuming of each operation and the proportion of each operation fall into a time range. The output is in log_measure.log file. A output example is in below.
@@@ -73,17 -73,18 +75,16 @@@ Add timing code in the monitoring star
long t0 = System. currentTimeMillis();
--
Add timing code in the monitoring stop area:
Measurement.INSTANCE.addOperationLatency(Operation, t0);
-
-
## Cache Hit Ratio Statistics
++
### Overview
To improve query performance, IOTDB caches ChunkMetaData and TsFileMetaData. Users can view the cache hit rate through debug level log and MXBean, and adjust the memory occupied by the cache according to the cache hit rate and system memory. The method of using MXBean to view cache hit ratio is as follows:
1. Connect to jconsole with port 31999 and select 'MBean' in the menu item above.
2. Expand the sidebar and select 'org.apache.iotdb.db.service'. You will get the results shown in the following figure:
--<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/13203019/65687623-404fc380-e09c-11e9-83c3-3c7c63a5b0be.jpeg">
-
++<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto; margin-right:auto; display:block;" src="https://user-images.githubusercontent.com/13203019/65687623-404fc380-e09c-11e9-83c3-3c7c63a5b0be.jpeg">