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

hxd pushed a change to branch NewDoc
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 08bf1d3  Merge branch 'master' into NewDoc
     add 3f739bf  [IOTDB-1276]Add explain sql support and remove debug_state 
parameter (#2848)
     add 4afda52  Fix incompatible max_degree_of_index_node (#2962)
     add b9b3ea7  [ISSUE-2911]Fix The write stream is not closed when executing 
the command 'tracing off' (#2961)
     add 506c8df  fix conflict

No new revisions were added by this update.

Summary of changes:
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |  7 +++++-
 .../iotdb/cluster/query/RemoteQueryContext.java    |  4 ++++
 .../apache/iotdb/cluster/server/ClientServer.java  |  4 ++--
 docs/UserGuide/Appendix/Config-Manual.md           |  2 +-
 docs/zh/UserGuide/Appendix/Config-Manual.md        |  1 +
 server/file-changelists/conf-changelist.md         |  7 ++++++
 .../resources/conf/iotdb-engine.properties         |  3 ---
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 ---------
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  6 -----
 .../apache/iotdb/db/engine/cache/ChunkCache.java   |  6 ++++-
 .../db/engine/cache/TimeSeriesMetadataCache.java   | 15 ++++++++----
 .../iotdb/db/engine/modification/Deletion.java     | 16 +++++++++++++
 .../engine/storagegroup/StorageGroupProcessor.java | 21 +++++++++++++----
 .../db/engine/storagegroup/TsFileProcessor.java    | 10 ++++++++
 .../db/engine/storagegroup/TsFileResource.java     |  9 ++++----
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  9 ++++++++
 .../org/apache/iotdb/db/qp/logical/Operator.java   | 11 +++++++++
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  | 10 ++++++++
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |  6 ++++-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  9 +++++++-
 .../iotdb/db/query/context/QueryContext.java       | 11 +++++++++
 .../iotdb/db/query/control/TracingManager.java     | 27 +++++++++++++++++++---
 .../iotdb/db/query/executor/LastQueryExecutor.java | 16 +++++++++++++
 .../db/query/reader/chunk/DiskChunkLoader.java     |  9 +++++---
 .../chunk/metadata/DiskChunkMetadataLoader.java    | 27 +++++++++++++++++++++-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  8 +++----
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |  3 ++-
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |  2 +-
 .../iotdb/db/query/control/TracingManagerTest.java |  3 +++
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |  2 +-
 .../iotdb/tsfile/file/metadata/ChunkMetadata.java  |  4 ++--
 .../tsfile/file/metadata/TimeseriesMetadata.java   | 25 ++++++++++++++++++++
 32 files changed, 248 insertions(+), 56 deletions(-)

Reply via email to