This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 797c193 Merge branch 'master' into cluster_premerge
add 35e9d9f minor correction of the "Comparison" documentation (#1871)
add 263b783 Update docs/Documentation-CHN/UserGuide/5-Operation
Manual/4-SQL Reference.md
add 63d5b09 Update docs/Documentation/UserGuide/5-Operation Manual/4-SQL
Reference.md
add e705465 Merge branch 'master' of https://github.com/apache/iotdb
add 4771a8d Merge pull request #2 from apache/master
add 7dc521a Merge branch 'master' of https://github.com/apache/iotdb
add 145801b Merge branch 'master' of https://github.com/apache/iotdb
add d1daf27 tracing log
add 2b3de88 Merge pull request #1867 from Alima777/tracingLog
add 6579fd6 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/Comparison/TSDB-Comparison.md | 28 +++++-----
docs/UserGuide/Get Started/QuickStart.md | 2 +-
.../System Tools/Performance Tracing Tool.md | 18 ++++---
.../System Tools/Performance Tracing Tool.md | 16 +++---
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 --
.../db/query/control/QueryResourceManager.java | 5 +-
.../iotdb/db/query/control/TracingManager.java | 63 ++++++++++++++++------
.../iotdb/db/query/reader/series/SeriesReader.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 6 +--
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
10 files changed, 90 insertions(+), 56 deletions(-)
