You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/07/09 13:05:35 UTC
[incubator-iotdb] 04/05: Merge branch 'master' into
dynamic_parameters
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch dynamic_parameters
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d6050d6f325a069b5716e92b9c2b2a58a2560754
Merge: cd693b4 d7a9e35
Author: lta <li...@163.com>
AuthorDate: Tue Jul 9 20:57:57 2019 +0800
Merge branch 'master' into dynamic_parameters
docs/Development.md | 12 +
.../Frequently asked questions.md} | 7 +-
docs/Documentation-CHN/OtherMaterial-Examples.md | 83 ++
docs/Documentation-CHN/OtherMaterial-Reference.md | 31 +
.../OtherMaterial-ReleaseNotesV0.7.0.md} | 7 +-
docs/Documentation-CHN/QuickStart.md | 290 ++++++
.../UserGuideV0.7.0/1-Overview/1-What is IoTDB.md} | 7 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 +
.../UserGuideV0.7.0/1-Overview/3-Scenario.md | 78 ++
.../UserGuideV0.7.0/1-Overview/4-Features.md | 51 +
.../1-Key Concepts and Terminology.md | 179 ++++
.../2-Data Type.md | 34 +
.../3-Encoding.md | 63 ++
.../4-Compression.md | 28 +
.../3-Operation Manual/1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 118 +++
.../3-Operation Manual/3-Data Import.md | 85 ++
.../3-Operation Manual/4-Data Query.md | 508 ++++++++++
.../3-Operation Manual/5-Data Maintenance.md | 83 ++
.../3-Operation Manual/6-Priviledge Management.md | 134 +++
.../4-Deployment and Management/1-Deployment.md | 99 ++
.../4-Deployment and Management/2-Configuration.md | 414 ++++++++
.../3-System Monitor.md | 152 +++
.../4-Deployment and Management/4-System log.md | 64 ++
.../5-Data Management.md | 74 ++
.../6-Build and use IoTDB by Dockerfile.md} | 7 +-
.../1-IoTDB Query Statement.md} | 233 +----
.../5-IoTDB SQL Documentation/2-Reference.md | 137 +++
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md} | 7 +-
.../UserGuideV0.7.0/7-Tools-Cli.md | 77 ++
.../UserGuideV0.7.0/7-Tools-Grafana.md | 118 +++
.../UserGuideV0.7.0/7-Tools-Hadoop.md} | 7 +-
.../UserGuideV0.7.0/7-Tools-spark.md} | 7 +-
.../{6-JDBC Documentation.md => 0-Content.md} | 35 +-
.../1-What is IoTDB.md} | 7 +-
.../UserGuideV0.7.0/1-Overview/2-Architecture.md | 36 +
.../{1-Overview.md => 1-Overview/3-Scenario.md} | 42 -
.../UserGuideV0.7.0/1-Overview/4-Features.md | 33 +
.../1-Key Concepts and Terminology.md} | 73 +-
.../2-Data Type.md | 38 +
.../3-Encoding.md | 62 ++
.../4-Compression.md | 28 +
.../1-Sample Data.md} | 9 +-
.../3-Operation Manual/2-Data Model Selection.md | 115 +++
.../3-Operation Manual/3-Data Import.md | 87 ++
.../4-Data Query.md} | 395 +-------
.../3-Operation Manual/5-Data Maintenance.md | 82 ++
.../3-Operation Manual/6-Priviledge Management.md | 124 +++
.../UserGuideV0.7.0/4-Deployment and Management.md | 1019 --------------------
.../4-Deployment and Management/1-Deployment.md | 169 ++++
.../4-Deployment and Management/2-Configuration.md | 329 +++++++
.../3-System Monitor.md | 359 +++++++
.../4-Deployment and Management/4-System log.md | 66 ++
.../5-Data Management.md | 77 ++
.../6-Build and use IoTDB by Dockerfile.md | 92 ++
.../1-IoTDB Query Statement.md} | 129 ---
.../5-IoTDB SQL Documentation/2-Reference.md | 137 +++
.../1-JDBC API.md} | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 39 +
.../qp/executor/AbstractQueryProcessExecutor.java | 4 +-
.../iotdb/db/query/executor/EngineExecutor.java | 2 +-
.../sequence/SequenceSeriesReaderByTimestamp.java | 4 +-
...ava => FileSeriesReaderByTimestampAdapter.java} | 4 +-
.../writelog/recover/TsFileRecoverPerformer.java | 24 +-
tsfile/example/readme.md | 39 +-
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 236 +++--
.../apache/iotdb/tsfile/write/TsFileWriter.java | 2 +-
67 files changed, 5130 insertions(+), 2013 deletions(-)