This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 5634843 [IOTDB-193]Create schema automatically (#430)
add f3948a4 modify doc
add 900f0e9 modify documents
add cd3c9e1 Separate TsFile section into Deployment and Operation manual
add 219d1d5 change some details
add fd855b1 change some details
add 2b482ef Resolve conflicts
add 11c7fc3 Update 7-IoTDB Query Language.md
add 9d33212 Update 4-Data Query.md
add 3369e33 Update 4-Features.md
add c5dadb8 Merge branch 'doc-changes' of
https://github.com/HTHou/incubator-iotdb into doc-changes
add 43f13c5 Resolve conflicts
add f6f2424 Update 7-IoTDB Query Language.md
add 6ac184c Resolve conflicts
add 47157ce Resolve conflicts
add fafd2dd Update 7-IoTDB Query Language.md
add b4ef07d Resolve conflict
add 7453712 Resolve conflicts
add 6b6f140 try to resolve conflicts
add e6ca7ec try to resolve conflicts
add 03a58fc try to resolve conflicts
add 8cdd31c try to resolve conflicts
add e6ca1f1 try to resolve conflicts
add 00ad5fa Merge branch 'doc-changes' of
https://github.com/HTHou/incubator-iotdb into HTHou-doc-changes
add 5adfcbb Merge branch 'HTHou-doc-changes'
add f366655 resolve conflict when merge pr450
add 9265f44 Merge pull request #469 from apache/new_doc_pr
No new revisions were added by this update.
Summary of changes:
docs/Documentation-CHN/QuickStart.md | 4 +-
.../1-Key Concepts and Terminology.md | 0
.../2-Data Type.md | 2 +-
.../3-Encoding.md | 0
.../4-Compression.md | 2 +-
.../1-Deployment.md | 4 +-
.../2-Configuration.md | 2 +-
.../3-Build and use IoTDB by Dockerfile.md} | 2 +-
.../4-TsFile library Installation.md} | 3 +-
.../UserGuide/3-Operation Manual/1-Sample Data.md | 28 -----
.../1-Cli Shell Tool.md} | 1 +
.../2-Data Model Selection.md | 21 ++--
.../3-Data Import.md | 8 +-
.../4-Data Query.md | 18 +--
.../5-Data Maintenance.md | 8 +-
.../6-Priviledge Management.md | 6 +-
.../7-IoTDB Query Language.md} | 118 +++++++++++++++++-
.../8-TsFile Usage.md} | 3 +-
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ---------------------
.../1-System Monitor.md} | 12 +-
.../2-Performance Monitor.md} | 20 ++-
.../3-System log.md} | 6 +-
.../4-Data Management.md} | 10 +-
.../2-Status Code.md => 6-API/1-JDBC API.md} | 6 +-
.../1-Session API.md => 6-API/2-Session API.md} | 4 +-
.../{8-TsFile/2-Usage.md => 6-API/3-Python API.md} | 3 +-
.../1-Hierarchy.md} | 0
.../1-Sync.md => 8-System Tools/1-Sync Tool.md} | 3 +-
.../2-Memory Estimation Tool.md | 4 +-
.../3-JMX Tool.md | 2 +-
.../4-Grafana.md} | 2 +-
.../5-TsFile Hadoop Connector.md} | 25 ++--
.../6-TsFile Spark Connector.md} | 4 +-
.../7-Spark IoTDB Connector.md} | 4 +-
.../8-Watermark Tool.md} | 3 +-
docs/Documentation/QuickStart.md | 6 +-
docs/Documentation/UserGuide/0-Content.md | 51 ++++----
.../UserGuide/1-Overview/4-Features.md | 33 +++--
.../1-Key Concepts and Terminology.md | 6 +-
.../2-Data Type.md | 2 +-
.../3-Encoding.md | 4 +-
.../4-Compression.md | 2 +-
.../1-Deployment.md | 6 +-
.../2-Configuration.md | 4 +-
.../3-Build and use IoTDB by Dockerfile.md} | 6 +-
.../4-TsFile library Installation.md} | 9 +-
.../UserGuide/3-Operation Manual/1-Sample Data.md | 28 -----
.../1-Cli Shell Tool.md} | 1 +
.../2-Data Model Selection.md | 18 ++-
.../3-Data Import.md | 8 +-
.../4-Data Query.md | 20 +--
.../5-Data Maintenance.md | 8 +-
.../6-Priviledge Management.md | 6 +-
.../7-IoTDB Query Statement.md} | 124 ++++++++++++++++++-
.../8-TsFile Usage.md} | 20 ++-
.../5-IoTDB SQL Documentation/2-Reference.md | 137 ---------------------
.../1-System Monitor.md} | 10 +-
.../2-Performance Monitor.md} | 10 +-
.../3-System log.md} | 4 +-
.../4-Data Management.md} | 10 +-
.../UserGuide/{6-JDBC API => 6-API}/1-JDBC API.md | 48 +++++++-
.../1-Session API.md => 6-API/2-Session API.md} | 22 ++--
.../Documentation/UserGuide/6-API/3-Python API.md | 4 +-
.../UserGuide/6-JDBC API/2-Status Code.md | 64 ----------
.../1-Hierarchy.md} | 2 +-
.../1-Sync.md => 8-System Tools/1-Sync Tool.md} | 17 +--
.../2-Memory Estimation Tool.md | 13 +-
.../3-JMX Tool.md | 2 +-
.../4-Grafana.md} | 3 +-
.../5-TsFile Hadoop Connector.md} | 25 ++--
.../6-TsFile Spark Connector.md} | 44 ++-----
.../7-Spark IoTDB Connecter.md} | 2 +
.../8-Watermark Tool.md} | 12 +-
73 files changed, 566 insertions(+), 700 deletions(-)
rename docs/Documentation-CHN/UserGuide/{2-Concept Key Concepts and
Terminology => 2-Concept}/1-Key Concepts and Terminology.md (100%)
rename docs/Documentation-CHN/UserGuide/{2-Concept Key Concepts and
Terminology => 2-Concept}/2-Data Type.md (78%)
rename docs/Documentation-CHN/UserGuide/{2-Concept Key Concepts and
Terminology => 2-Concept}/3-Encoding.md (100%)
rename docs/Documentation-CHN/UserGuide/{2-Concept Key Concepts and
Terminology => 2-Concept}/4-Compression.md (95%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management =>
3-Deployment}/1-Deployment.md (96%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management =>
3-Deployment}/2-Configuration.md (99%)
copy docs/Documentation-CHN/UserGuide/{8-TsFile/1-Installation.md =>
3-Deployment/3-Build and use IoTDB by Dockerfile.md} (95%)
rename docs/Documentation-CHN/UserGuide/{6-JDBC API/1-JDBC API.md =>
3-Deployment/4-TsFile library Installation.md} (95%)
delete mode 100644 docs/Documentation-CHN/UserGuide/3-Operation
Manual/1-Sample Data.md
copy docs/Documentation-CHN/UserGuide/{9-Tools-Cli.md => 4-Operation
Manual/1-Cli Shell Tool.md} (99%)
rename docs/Documentation-CHN/UserGuide/{3-Operation Manual => 4-Operation
Manual}/2-Data Model Selection.md (76%)
rename docs/Documentation-CHN/UserGuide/{3-Operation Manual => 4-Operation
Manual}/3-Data Import.md (80%)
rename docs/Documentation-CHN/UserGuide/{3-Operation Manual => 4-Operation
Manual}/4-Data Query.md (94%)
rename docs/Documentation-CHN/UserGuide/{3-Operation Manual => 4-Operation
Manual}/5-Data Maintenance.md (86%)
rename docs/Documentation-CHN/UserGuide/{3-Operation Manual => 4-Operation
Manual}/6-Priviledge Management.md (93%)
rename docs/Documentation-CHN/UserGuide/{5-IoTDB SQL Documentation/1-IoTDB
Query Statement.md => 4-Operation Manual/7-IoTDB Query Language.md} (86%)
rename docs/Documentation-CHN/UserGuide/{8-TsFile/1-Installation.md =>
4-Operation Manual/8-TsFile Usage.md} (95%)
delete mode 100644 docs/Documentation-CHN/UserGuide/5-IoTDB SQL
Documentation/2-Reference.md
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management/3-System
Monitor.md => 5-Management/1-System Monitor.md} (84%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and
Management/4-Performance Monitor.md => 5-Management/2-Performance Monitor.md}
(96%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management/5-System
log.md => 5-Management/3-System log.md} (95%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management/6-Data
Management.md => 5-Management/4-Data Management.md} (87%)
rename docs/Documentation-CHN/UserGuide/{6-JDBC API/2-Status Code.md =>
6-API/1-JDBC API.md} (98%)
rename docs/Documentation-CHN/UserGuide/{7-Session API/1-Session API.md =>
6-API/2-Session API.md} (97%)
rename docs/Documentation-CHN/UserGuide/{8-TsFile/2-Usage.md => 6-API/3-Python
API.md} (96%)
rename docs/Documentation-CHN/UserGuide/{8-TsFile/3-Hierarchy.md => 7-System
Design/1-Hierarchy.md} (100%)
rename docs/Documentation-CHN/UserGuide/{9-System Tools/1-Sync.md => 8-System
Tools/1-Sync Tool.md} (99%)
rename docs/Documentation-CHN/UserGuide/{9-System Tools => 8-System
Tools}/2-Memory Estimation Tool.md (98%)
rename docs/Documentation-CHN/UserGuide/{9-System Tools => 8-System
Tools}/3-JMX Tool.md (98%)
copy docs/Documentation-CHN/UserGuide/{9-Tools-Grafana.md => 8-System
Tools/4-Grafana.md} (99%)
copy docs/Documentation-CHN/UserGuide/{9-Tools-Hadoop.md => 8-System
Tools/5-TsFile Hadoop Connector.md} (94%)
copy docs/Documentation-CHN/UserGuide/{4-Deployment and Management/7-Build and
use IoTDB by Dockerfile.md => 8-System Tools/6-TsFile Spark Connector.md} (93%)
rename docs/Documentation-CHN/UserGuide/{4-Deployment and Management/7-Build
and use IoTDB by Dockerfile.md => 8-System Tools/7-Spark IoTDB Connector.md}
(93%)
rename docs/Documentation-CHN/UserGuide/{8-Tools-watermark.md => 8-System
Tools/8-Watermark Tool.md} (99%)
rename docs/Documentation/UserGuide/{2-Concept Key Concepts and Terminology =>
2-Concept}/1-Key Concepts and Terminology.md (97%)
rename docs/Documentation/UserGuide/{2-Concept Key Concepts and Terminology =>
2-Concept}/2-Data Type.md (76%)
rename docs/Documentation/UserGuide/{2-Concept Key Concepts and Terminology =>
2-Concept}/3-Encoding.md (79%)
rename docs/Documentation/UserGuide/{2-Concept Key Concepts and Terminology =>
2-Concept}/4-Compression.md (86%)
rename docs/Documentation/UserGuide/{4-Deployment and Management =>
3-Deployment}/1-Deployment.md (97%)
rename docs/Documentation/UserGuide/{4-Deployment and Management =>
3-Deployment}/2-Configuration.md (97%)
rename docs/Documentation/UserGuide/{4-Deployment and Management/7-Build and
use IoTDB by Dockerfile.md => 3-Deployment/3-Build and use IoTDB by
Dockerfile.md} (88%)
rename docs/Documentation/UserGuide/{8-TsFile/1-Installation.md =>
3-Deployment/4-TsFile library Installation.md} (94%)
delete mode 100644 docs/Documentation/UserGuide/3-Operation Manual/1-Sample
Data.md
copy docs/Documentation/UserGuide/{9-Tools-Cli.md => 4-Operation Manual/1-Cli
Shell Tool.md} (98%)
rename docs/Documentation/UserGuide/{3-Operation Manual => 4-Operation
Manual}/2-Data Model Selection.md (73%)
rename docs/Documentation/UserGuide/{3-Operation Manual => 4-Operation
Manual}/3-Data Import.md (82%)
rename docs/Documentation/UserGuide/{3-Operation Manual => 4-Operation
Manual}/4-Data Query.md (94%)
rename docs/Documentation/UserGuide/{3-Operation Manual => 4-Operation
Manual}/5-Data Maintenance.md (88%)
rename docs/Documentation/UserGuide/{3-Operation Manual => 4-Operation
Manual}/6-Priviledge Management.md (92%)
rename docs/Documentation/UserGuide/{5-IoTDB SQL Documentation/1-IoTDB Query
Statement.md => 4-Operation Manual/7-IoTDB Query Statement.md} (89%)
rename docs/Documentation/UserGuide/{8-TsFile/2-Usage.md => 4-Operation
Manual/8-TsFile Usage.md} (98%)
delete mode 100644 docs/Documentation/UserGuide/5-IoTDB SQL
Documentation/2-Reference.md
rename docs/Documentation/UserGuide/{4-Deployment and Management/3-System
Monitor.md => 5-Management/1-System Monitor.md} (92%)
rename docs/Documentation/UserGuide/{4-Deployment and Management/4-Performance
Monitor.md => 5-Management/2-Performance Monitor.md} (98%)
rename docs/Documentation/UserGuide/{4-Deployment and Management/5-System
log.md => 5-Management/3-System log.md} (98%)
rename docs/Documentation/UserGuide/{4-Deployment and Management/6-Data
Management.md => 5-Management/4-Data Management.md} (82%)
rename docs/Documentation/UserGuide/{6-JDBC API => 6-API}/1-JDBC API.md (79%)
rename docs/Documentation/UserGuide/{7-Session API/1-Session API.md =>
6-API/2-Session API.md} (90%)
copy client-py/readme.md => docs/Documentation/UserGuide/6-API/3-Python API.md
(97%)
delete mode 100644 docs/Documentation/UserGuide/6-JDBC API/2-Status Code.md
rename docs/Documentation/UserGuide/{8-TsFile/3-Hierarchy.md => 7-System
Design/1-Hierarchy.md} (99%)
rename docs/Documentation/UserGuide/{9-System Tools/1-Sync.md => 8-System
Tools/1-Sync Tool.md} (95%)
rename docs/Documentation/UserGuide/{9-System Tools => 8-System
Tools}/2-Memory Estimation Tool.md (94%)
rename docs/Documentation/UserGuide/{9-System Tools => 8-System Tools}/3-JMX
Tool.md (98%)
copy docs/Documentation/UserGuide/{9-Tools-Grafana.md => 8-System
Tools/4-Grafana.md} (98%)
copy docs/Documentation/UserGuide/{9-Tools-Hadoop.md => 8-System
Tools/5-TsFile Hadoop Connector.md} (94%)
copy docs/Documentation/UserGuide/{9-Tools-spark-tsfile.md => 8-System
Tools/6-TsFile Spark Connector.md} (94%)
copy docs/Documentation/UserGuide/{9-Tools-spark-iotdb.md => 8-System
Tools/7-Spark IoTDB Connecter.md} (99%)
rename docs/Documentation/UserGuide/{8-Tools-watermark.md => 8-System
Tools/8-Watermark Tool.md} (98%)
