You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/05/27 08:37:14 UTC

[incubator-iotdb] 02/03: Merge remote-tracking branch 'origin/master' into feature/pathid

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

hxd pushed a commit to branch feature/pathid
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 142830f63a2a9efd1bd492ed79a86a113eb44c9d
Merge: 08a07a6 b4ed539
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed May 27 12:21:31 2020 +0800

    Merge remote-tracking branch 'origin/master' into feature/pathid

 README.md                                          |   2 +-
 .../Architecture.md}                               |  18 +-
 .../{8-Client/1-RPC.md => Client/RPC.md}           |   0
 .../2-Hive-TsFile.md => Connector/Hive-TsFile.md}  |   0
 .../4-Spark-IOTDB.md => Connector/Spark-IOTDB.md}  |   0
 .../Spark-TsFile.md}                               |   2 +-
 .../AggregationQuery.md}                           |   0
 .../AlignByDeviceQuery.md}                         |   6 +-
 .../1-DataQuery.md => DataQuery/DataQuery.md}      |  18 +-
 .../FillFunction.md}                               |   0
 .../GroupByFillQuery.md}                           |   0
 .../GroupByQuery.md}                               |   0
 .../7-LastQuery.md => DataQuery/LastQuery.md}      |   0
 .../QueryFundamentals.md}                          |   2 +-
 .../RawDataQuery.md}                               |   0
 .../SeriesReader.md}                               |   0
 .../PlanExecutor.md}                               |   0
 .../2-Planner.md => QueryEngine/Planner.md}        |   0
 .../QueryEngine.md}                                |   4 +-
 .../ResultSetConstruction.md}                      |   8 +-
 .../SchemaManager.md}                              |   0
 .../DataManipulation.md}                           |   2 +-
 .../DataPartition.md}                              |   0
 .../FlushManager.md}                               |   0
 .../MergeManager.md}                               |   0
 .../StorageEngine.md}                              |   8 +-
 .../2-WAL.md => StorageEngine/WAL.md}              |   0
 .../{6-Tools/1-Sync.md => Tools/Sync.md}           |   0
 .../{1-TsFile/2-Format.md => TsFile/Format.md}     |   0
 .../{1-TsFile/4-Read.md => TsFile/Read.md}         |   0
 .../{1-TsFile/1-TsFile.md => TsFile/TsFile.md}     |   6 +-
 .../{1-TsFile/3-Write.md => TsFile/Write.md}       |   0
 .../1-Files.md => Architecture/Files.md}           |   8 +-
 .../Shared Nothing Cluster.md}                     |   0
 .../Writing Data on HDFS.md}                       |   0
 .../Command Line Interface.md}                     |   0
 .../Programming - JDBC.md}                         |   0
 .../Programming - MQTT.md}                         |   0
 .../Programming - Native API.md}                   |   0
 .../Programming - Other Languages.md}              |   0
 .../Programming - TsFile API.md}                   |   2 +-
 .../7-Status Codes.md => Client/Status Codes.md}   |   4 +-
 .../4-Compression.md => Concept/Compression.md}    |   2 +-
 .../Data Model and Terminology.md}                 |   0
 .../2-Data Type.md => Concept/Data Type.md}        |   2 +-
 .../3-Encoding.md => Concept/Encoding.md}          |   2 +-
 .../Grafana.md}                                    |   0
 .../Hive TsFile.md}                                |   0
 .../MapReduce TsFile.md}                           |   0
 .../Spark IoTDB.md}                                |   0
 .../Spark TsFile.md}                               |   0
 .../Frequently asked questions.md}                 |   0
 .../Publication.md}                                |   0
 .../1-QuickStart.md => Get Started/QuickStart.md}  |   6 +-
 .../Administration.md}                             |   2 +-
 .../DDL Data Definition Language.md}               |   4 +-
 .../DML Data Manipulation Language.md}             |  14 +-
 .../SQL Reference.md}                              |   0
 .../2-Architecture.md => Overview/Architecture.md} |   0
 .../4-Features.md => Overview/Features.md}         |   0
 .../3-Scenario.md => Overview/Scenario.md}         |   0
 .../What is IoTDB.md}                              |   0
 .../3-Cluster Setup.md => Server/Cluster Setup.md} |   0
 .../4-Config Manual.md => Server/Config Manual.md} |   0
 .../5-Docker Image.md => Server/Docker Image.md}   |   0
 .../{3-Server/1-Download.md => Server/Download.md} |   2 +-
 .../Single Node Setup.md}                          |   0
 .../3-JMX Tool.md => System Tools/JMX Tool.md}     |   0
 .../Load External Tsfile.md}                       |   0
 .../Log Visualizer.md}                             |   0
 .../Memory Estimation Tool.md}                     |   0
 .../Monitor and Log Tools.md}                      |   4 +-
 .../Query History Visualization Tool.md}           |   0
 .../1-Sync Tool.md => System Tools/Sync Tool.md}   |   0
 .../Watermark Tool.md}                             |   0
 .../Architecture.md}                               |  18 +-
 .../{8-Client/1-RPC.md => Client/RPC.md}           |   0
 .../2-Hive-TsFile.md => Connector/Hive-TsFile.md}  |   0
 .../4-Spark-IOTDB.md => Connector/Spark-IOTDB.md}  |   0
 .../Spark-TsFile.md}                               |  22 +-
 .../AggregationQuery.md}                           |   0
 .../AlignByDeviceQuery.md}                         |   6 +-
 .../1-DataQuery.md => DataQuery/DataQuery.md}      |  18 +-
 .../FillFunction.md}                               |   0
 .../GroupByFillQuery.md}                           |   0
 .../GroupByQuery.md}                               |   0
 .../7-LastQuery.md => DataQuery/LastQuery.md}      |   0
 .../QueryFundamentals.md}                          |   2 +-
 .../RawDataQuery.md}                               |   0
 .../SeriesReader.md}                               |   0
 .../PlanExecutor.md}                               |   0
 .../2-Planner.md => QueryEngine/Planner.md}        |   0
 .../QueryEngine.md}                                |   4 +-
 .../ResultSetConstruction.md}                      |   6 +-
 .../SchemaManager.md}                              |   0
 .../DataManipulation.md}                           |   5 +-
 .../DataPartition.md}                              |   0
 .../FlushManager.md}                               |   0
 .../MergeManager.md}                               |   0
 .../StorageEngine.md}                              |   8 +-
 .../2-WAL.md => StorageEngine/WAL.md}              |   0
 .../{6-Tools/1-Sync.md => Tools/Sync.md}           |   0
 .../{1-TsFile/2-Format.md => TsFile/Format.md}     |   0
 .../{1-TsFile/4-Read.md => TsFile/Read.md}         |   0
 .../{1-TsFile/1-TsFile.md => TsFile/TsFile.md}     |  10 +-
 .../{1-TsFile/3-Write.md => TsFile/Write.md}       |   0
 .../1-Files.md => Architecture/Files.md}           |   8 +-
 .../Shared Nothing Cluster.md}                     |   0
 .../Writing Data on HDFS.md}                       |   0
 .../Command Line Interface.md}                     |   0
 .../Programming - JDBC.md}                         |   0
 .../Programming - MQTT.md}                         |   0
 .../Programming - Native API.md}                   |   0
 .../Programming - Other Languages.md}              |   0
 .../Programming - TsFile API.md}                   |   2 +-
 .../7-Status Codes.md => Client/Status Codes.md}   |   4 +-
 .../4-Compression.md => Concept/Compression.md}    |   2 +-
 .../Data Model and Terminology.md}                 |   0
 .../2-Data Type.md => Concept/Data Type.md}        |   2 +-
 .../3-Encoding.md => Concept/Encoding.md}          |   2 +-
 .../Grafana.md}                                    |   0
 .../Hive TsFile.md}                                |   0
 .../MapReduce TsFile.md}                           |   0
 .../Spark IoTDB.md}                                |   0
 .../Spark TsFile.md}                               |   0
 .../Frequently asked questions.md}                 |   0
 .../Publication.md}                                |   0
 .../1-QuickStart.md => Get Started/QuickStart.md}  |   6 +-
 .../Administration.md}                             |   0
 .../DDL Data Definition Language.md}               |   4 +-
 .../DML Data Manipulation Language.md}             |  10 +-
 .../SQL Reference.md}                              |   0
 .../2-Architecture.md => Overview/Architecture.md} |   0
 .../4-Features.md => Overview/Features.md}         |   0
 .../3-Scenario.md => Overview/Scenario.md}         |   0
 .../What is IoTDB.md}                              |   0
 .../3-Cluster Setup.md => Server/Cluster Setup.md} |   0
 .../4-Config Manual.md => Server/Config Manual.md} |   0
 .../5-Docker Image.md => Server/Docker Image.md}   |   0
 .../{3-Server/1-Download.md => Server/Download.md} |   2 +-
 .../Single Node Setup.md}                          |   0
 .../3-JMX Tool.md => System Tools/JMX Tool.md}     |   0
 .../Load External Tsfile.md}                       |   0
 .../Log Visualizer.md}                             |   0
 .../Memory Estimation Tool.md}                     |   0
 .../Monitor and Log Tools.md}                      |   6 +-
 .../Query History Visualization Tool.md}           |   0
 .../1-Sync Tool.md => System Tools/Sync Tool.md}   |   0
 .../Watermark Tool.md}                             |   0
 .../main/java/org/apache/iotdb/SessionExample.java |   4 +-
 .../resources/conf/iotdb-engine.properties         |  22 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  69 ++--
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  11 +-
 .../db/exception/metadata/MetadataException.java   |   3 +-
 .../metadata/StorageGroupAlreadySetException.java  |   5 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  10 +-
 .../apache/iotdb/db/utils/TypeInferenceUtils.java  |  41 ++-
 .../iotdb/db/writelog/io/SingleFileLogReader.java  |   2 +-
 .../iotdb/db/integration/IoTDBRestartIT.java       |  18 +-
 .../iotdb/db/utils/TypeInferenceUtilsTest.java     |  13 +-
 .../main/java/org/apache/iotdb/rpc/RpcUtils.java   |   3 +-
 .../iotdb/rpc/StatementExecutionException.java     |  13 +
 site/src/main/.vuepress/config.js                  | 374 ++++++++++-----------
 163 files changed, 463 insertions(+), 400 deletions(-)