You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/04/30 06:21:14 UTC
[incubator-iotdb] branch upgrade_tool updated (ca20dce -> ee5503c)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch upgrade_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ca20dce Merge branch 'master' into upgrade_tool
add a1953fc Resolving spelling mistakes in variable names in AuthUtils (#1110)
add f9c63e5 [IOTDB-624]Fix a Last cache bug when WAL is disabled (#1109)
add e1da6e8 add show child paths documents. (#1108)
add f512b2c add cache size log
add a73a74b rename insertInObject in SessionExample to insertRecordInObject
add bf10d9e [IOTDB-611] Add documents introducing Data Query design fundamentals (#1101)
add aa88f18 Merge branch 'master' of https://github.com/apache/incubator-iotdb into upgrade_tool
add 35de74a [IOTDB-626] Fix UserGuide error of v0.9.x (#1123)
add 03c2305 [IOTDB-625] Change default storage group level number (#1121)
add 4fb606f [IOTDB-628] rename package client to cli (#1122)
add 8c59b1b Update status code related doc (#1116)
add 85ef983 [IOTDB-605] Add more levels of index in TsFileMetadata (#1100)
add 322029e merge master and resolve conflicts
add 91b26ff fix SessionPool logger
add eed08de Merge branch 'master' of https://github.com/apache/incubator-iotdb into upgrade_tool
add ee5503c fix bugs
No new revisions were added by this update.
Summary of changes:
{client => cli}/pom.xml | 6 +-
.../client.xml => cli/src/assembly/cli.xml | 2 +-
.../src/assembly/resources/sbin/start-cli.bat | 4 +-
.../src/assembly/resources/sbin/start-cli.sh | 2 +-
.../src/assembly/resources/tools/export-csv.bat | 0
.../src/assembly/resources/tools/export-csv.sh | 0
.../src/assembly/resources/tools/import-csv.bat | 0
.../src/assembly/resources/tools/import-csv.sh | 0
.../java/org/apache/iotdb/cli/AbstractCli.java | 9 +-
.../src/main/java/org/apache/iotdb/cli/Cli.java | 10 +-
.../src/main/java/org/apache/iotdb/cli/WinCli.java | 6 +-
.../apache/iotdb/exception/ArgsErrorException.java | 0
.../org/apache/iotdb/tool/AbstractCsvTool.java | 0
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 0
.../java/org/apache/iotdb/cli/AbstractCliIT.java | 218 ++++++++++++
.../java/org/apache/iotdb/cli}/AbstractScript.java | 4 +-
.../org/apache/iotdb/cli}/StartClientScriptIT.java | 8 +-
.../org/apache/iotdb/tool/ExportCsvTestIT.java | 2 +-
.../org/apache/iotdb/tool/ImportCsvTestIT.java | 2 +-
{client => cli}/src/test/resources/logback.xml | 0
.../org/apache/iotdb/client/AbstractClientIT.java | 218 ------------
distribution/pom.xml | 2 +-
docs/SystemDesign/1-TsFile/3-Write.md | 2 +-
docs/SystemDesign/5-DataQuery/1-DataQuery.md | 4 +-
.../5-DataQuery/2-QueryFundamentals.md | 128 +++++++
.../5-DataQuery/3-ModificationHandle.md | 73 ----
.../{2-SeriesReader.md => 3-SeriesReader.md} | 0
docs/UserGuide/0-Get Started/1-QuickStart.md | 12 +-
.../0-Get Started/2-Frequently asked questions.md | 14 +-
docs/UserGuide/3-Server/4-Config Manual.md | 12 +
.../UserGuide/4-Client/1-Command Line Interface.md | 44 +--
docs/UserGuide/4-Client/3-Programming - JDBC.md | 8 +
.../4-Client/5-Programming - TsFile API.md | 12 -
docs/UserGuide/4-Client/7-Status Codes.md | 11 +-
.../1-DDL Data Definition Language.md | 32 ++
.../6-System Tools/8-Load External Tsfile.md | 4 +-
docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 4 +-
.../5-DataQuery/2-QueryFundamentals.md | 110 ++++++
.../5-DataQuery/3-ModificationHandle.md | 73 ----
.../{2-SeriesReader.md => 3-SeriesReader.md} | 0
docs/zh/UserGuide/0-Get Started/1-QuickStart.md | 10 +-
.../0-Get Started/2-Frequently asked questions.md | 8 +-
docs/zh/UserGuide/3-Server/4-Config Manual.md | 13 +
.../UserGuide/4-Client/1-Command Line Interface.md | 38 +--
docs/zh/UserGuide/4-Client/3-Programming - JDBC.md | 9 +-
.../4-Client/5-Programming - TsFile API.md | 13 -
docs/zh/UserGuide/4-Client/7-Status Codes.md | 11 +-
.../1-DDL Data Definition Language.md | 32 ++
.../6-System Tools/8-Load External Tsfile.md | 4 +-
.../main/java/org/apache/iotdb/SessionExample.java | 2 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 15 +-
.../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 +
.../util/TSFileConfigUtilCompletenessTest.java | 102 +++---
pom.xml | 2 +-
.../resources/conf/iotdb-engine.properties | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 40 ++-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 1 +
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 1 +
.../db/engine/cache/TimeSeriesMetadataCache.java | 33 +-
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 24 +-
.../engine/storagegroup/StorageGroupProcessor.java | 23 +-
.../db/engine/storagegroup/TsFileProcessor.java | 9 +
.../org/apache/iotdb/db/metadata/MetaUtils.java | 6 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 14 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 70 ++--
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 22 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 38 +--
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 14 +-
.../writelog/recover/TsFileRecoverPerformer.java | 28 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 6 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 4 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 54 +++
site/src/main/.vuepress/config.js | 14 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 2 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 2 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 7 +-
tsfile/format-changelist.md | 1 +
.../iotdb/tsfile/common/conf/TSFileConfig.java | 12 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 +
.../file/metadata/MetadataIndexConstructor.java | 151 +++++++++
.../tsfile/file/metadata/MetadataIndexEntry.java | 91 +++++
.../tsfile/file/metadata/MetadataIndexNode.java | 125 +++++++
.../tsfile/file/metadata/TimeseriesMetadata.java | 9 +-
.../iotdb/tsfile/file/metadata/TsFileMetadata.java | 50 +--
...{TSDataType.java => MetadataIndexNodeType.java} | 181 +++++-----
.../iotdb/tsfile/read/TsFileSequenceReader.java | 372 +++++++++++++++------
.../tsfile/read/controller/IMetadataQuerier.java | 2 +-
.../read/controller/MetadataQuerierByFileImpl.java | 27 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 3 -
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 7 +
.../write/writer/RestorableTsFileIOWriter.java | 9 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 67 ++--
.../file/metadata/MetadataIndexNodeTest.java | 46 +++
.../tsfile/file/metadata/utils/TestHelper.java | 20 +-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 14 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 5 +-
101 files changed, 1852 insertions(+), 1073 deletions(-)
rename {client => cli}/pom.xml (97%)
rename client/src/assembly/client.xml => cli/src/assembly/cli.xml (98%)
rename client/src/assembly/resources/sbin/start-client.bat => cli/src/assembly/resources/sbin/start-cli.bat (94%)
mode change 100755 => 100644
rename client/src/assembly/resources/sbin/start-client.sh => cli/src/assembly/resources/sbin/start-cli.sh (97%)
mode change 100755 => 100644
rename {client => cli}/src/assembly/resources/tools/export-csv.bat (100%)
rename {client => cli}/src/assembly/resources/tools/export-csv.sh (100%)
mode change 100755 => 100644
rename {client => cli}/src/assembly/resources/tools/import-csv.bat (100%)
rename {client => cli}/src/assembly/resources/tools/import-csv.sh (100%)
mode change 100755 => 100644
rename client/src/main/java/org/apache/iotdb/client/AbstractClient.java => cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java (99%)
rename client/src/main/java/org/apache/iotdb/client/Client.java => cli/src/main/java/org/apache/iotdb/cli/Cli.java (94%)
rename client/src/main/java/org/apache/iotdb/client/WinClient.java => cli/src/main/java/org/apache/iotdb/cli/WinCli.java (97%)
rename {client => cli}/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java (100%)
rename {client => cli}/src/main/java/org/apache/iotdb/tool/AbstractCsvTool.java (100%)
rename {client => cli}/src/main/java/org/apache/iotdb/tool/ExportCsv.java (99%)
rename {client => cli}/src/main/java/org/apache/iotdb/tool/ImportCsv.java (100%)
create mode 100644 cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
rename {client/src/test/java/org/apache/iotdb/client => cli/src/test/java/org/apache/iotdb/cli}/AbstractScript.java (97%)
rename {client/src/test/java/org/apache/iotdb/client => cli/src/test/java/org/apache/iotdb/cli}/StartClientScriptIT.java (96%)
rename {client => cli}/src/test/java/org/apache/iotdb/tool/ExportCsvTestIT.java (98%)
rename {client => cli}/src/test/java/org/apache/iotdb/tool/ImportCsvTestIT.java (98%)
rename {client => cli}/src/test/resources/logback.xml (100%)
delete mode 100644 client/src/test/java/org/apache/iotdb/client/AbstractClientIT.java
create mode 100644 docs/SystemDesign/5-DataQuery/2-QueryFundamentals.md
delete mode 100644 docs/SystemDesign/5-DataQuery/3-ModificationHandle.md
rename docs/SystemDesign/5-DataQuery/{2-SeriesReader.md => 3-SeriesReader.md} (100%)
create mode 100644 docs/zh/SystemDesign/5-DataQuery/2-QueryFundamentals.md
delete mode 100644 docs/zh/SystemDesign/5-DataQuery/3-ModificationHandle.md
rename docs/zh/SystemDesign/5-DataQuery/{2-SeriesReader.md => 3-SeriesReader.md} (100%)
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexConstructor.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexEntry.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNode.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/{TSDataType.java => MetadataIndexNodeType.java} (60%)
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/MetadataIndexNodeTest.java