You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/03/11 08:59:32 UTC
[iotdb] 01/01: fix conflict in release note
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch fix-release-note-0.13.4
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa9f2f37822b9c190de8fb5bd4fa15857cb00f41
Merge: a9368ccc8d 75eaadccdf
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Sat Mar 11 16:58:34 2023 +0800
fix conflict in release note
.github/workflows/main-win.yml | 50 +---------
RELEASE_NOTES.md | 9 ++
docs/UserGuide/API/Programming-Go-Native-API.md | 47 ++++++++++
docs/UserGuide/API/Programming-JDBC.md | 2 +-
docs/UserGuide/API/Programming-MQTT.md | 4 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 2 +-
.../Data-Concept/Data-Model-and-Terminology.md | 4 +-
docs/UserGuide/Data-Concept/Schema-Template.md | 6 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 2 +-
.../DBeaver.md | 16 ++--
.../Flink-IoTDB.md} | 0
.../Flink-TsFile.md} | 0
.../Grafana-Connector.md} | 6 +-
.../Grafana-Plugin.md} | 24 ++---
.../Hive-TsFile.md} | 0
.../MapReduce-TsFile.md} | 0
.../NiFi-IoTDB.md | 0
.../Spark-IoTDB.md} | 2 +-
.../Spark-TsFile.md} | 4 +-
.../Writing-Data-on-HDFS.md} | 2 +-
.../Zeppelin-IoTDB.md | 8 +-
docs/UserGuide/IoTDB-Introduction/Architecture.md | 2 +-
docs/UserGuide/IoTDB-Introduction/Scenario.md | 14 +--
docs/UserGuide/Maintenance-Tools/JMX-Tool.md | 4 +-
docs/UserGuide/Maintenance-Tools/Log-Tool.md | 6 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 10 +-
.../Operate-Metadata/Auto-Create-MetaData.md | 2 +-
docs/UserGuide/Operate-Metadata/Timeseries.md | 4 +-
docs/UserGuide/Process-Data/Alerting.md | 2 +-
docs/UserGuide/Process-Data/Triggers.md | 2 +-
.../Process-Data/UDF-User-Defined-Function.md | 2 +-
docs/UserGuide/Query-Data/Aggregate-Query.md | 2 +-
docs/UserGuide/Query-Data/Fill-Null-Value.md | 4 -
docs/UserGuide/Query-Data/Select-Expression.md | 8 +-
.../UserGuide/QuickStart/Command-Line-Interface.md | 28 +++---
docs/UserGuide/QuickStart/QuickStart.md | 2 +-
docs/UserGuide/Reference/Config-Manual.md | 2 +-
docs/UserGuide/Reference/SQL-Reference.md | 4 +-
docs/UserGuide/Reference/TSDB-Comparison.md | 16 ++--
docs/UserGuide/UserGuideReadme.md | 5 +-
docs/zh/UserGuide/API/InfluxDB-Protocol.md | 10 +-
docs/zh/UserGuide/API/Programming-JDBC.md | 2 +-
docs/zh/UserGuide/API/Programming-MQTT.md | 4 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 2 +-
.../Data-Concept/Data-Model-and-Terminology.md | 4 +-
docs/zh/UserGuide/Data-Concept/Schema-Template.md | 6 +-
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 2 +-
.../DBeaver.md | 16 ++--
.../Flink-IoTDB.md} | 0
.../Flink-TsFile.md} | 0
.../Grafana-Connector.md} | 6 +-
.../Grafana-Plugin.md} | 24 ++---
.../Hive-TsFile.md} | 0
.../MapReduce-TsFile.md} | 0
.../NiFi-IoTDB.md | 0
.../Spark TsFile.md | 0
.../Spark-IoTDB.md} | 0
.../Writing-Data-on-HDFS.md} | 2 +-
.../Zeppelin-IoTDB.md | 8 +-
.../UserGuide/IoTDB-Introduction/Architecture.md | 2 +-
docs/zh/UserGuide/IoTDB-Introduction/Scenario.md | 14 +--
docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md | 4 +-
docs/zh/UserGuide/Maintenance-Tools/Log-Tool.md | 6 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 10 +-
.../Operate-Metadata/Auto-Create-MetaData.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 4 +-
docs/zh/UserGuide/Process-Data/Alerting.md | 2 +-
docs/zh/UserGuide/Process-Data/Continuous-Query.md | 2 +-
docs/zh/UserGuide/Process-Data/Triggers.md | 2 +-
.../Process-Data/UDF-User-Defined-Function.md | 2 +-
docs/zh/UserGuide/Query-Data/Aggregate-Query.md | 2 +-
docs/zh/UserGuide/Query-Data/Select-Expression.md | 10 +-
.../UserGuide/QuickStart/Command-Line-Interface.md | 26 +++---
docs/zh/UserGuide/QuickStart/QuickStart.md | 2 +-
docs/zh/UserGuide/Reference/SQL-Reference.md | 4 +-
docs/zh/UserGuide/Reference/TSDB-Comparison.md | 14 +--
docs/zh/UserGuide/UserGuideReadme.md | 7 +-
.../db/engine/storagegroup/StorageGroupInfo.java | 17 +++-
.../storagegroup/VirtualStorageGroupProcessor.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 4 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 2 +
.../db/service/metrics/predefined/FileMetrics.java | 102 +++++++++++++++++----
.../db/service/thrift/impl/TSServiceImpl.java | 2 +-
.../java/org/apache/iotdb/db/utils/FileUtils.java | 54 +++++++++++
.../writelog/recover/TsFileRecoverPerformer.java | 2 +-
86 files changed, 424 insertions(+), 274 deletions(-)
diff --cc RELEASE_NOTES.md
index a184e06b33,43fbb3eae2..1a0573dea1
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@@ -21,6 -21,15 +21,14 @@@
# Apache IoTDB 0.13.4
+ ## New Feature
+
-* [IOTDB-3662] Add audit log
+ * [IOTDB-4675] Support load mlog.bin
+ * [IOTDB-4767] Support get all connection info in session api
+ * [IOTDB-4967] Fix slidingTimeWindow stops when encounter an empty window
+ * [IOTDB-5133] Export schema tool
+ * [IOTDB-5173] Add the statistics of flush point
+
## Improvements
* [IOTDB-4230] Modify the start script for flexible startup: add iotdb.in.sh, add pid file