This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch xianyi in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 469cdfff98320f17070e6b8cc9cfb8ba289946cf Merge: c221c0d 6487443 Author: Steve Yurong Su <[email protected]> AuthorDate: Fri Nov 26 22:33:01 2021 +0800 Merge branch 'master' of github.com:apache/iotdb into xianyi LICENSE-binary | 6 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 4 +- cli/pom.xml | 11 +- cli/src/assembly/resources/sbin/start-cli.bat | 2 +- cli/src/main/java/org/apache/iotdb/cli/Cli.java | 40 +++-- .../apache/iotdb/cli/IoTDBSyntaxHighlighter.java | 76 +++++++++ cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 175 --------------------- .../org/apache/iotdb/cli/utils/JlineUtils.java | 107 +++++++++++++ .../org/apache/iotdb/tool/AbstractCsvTool.java | 3 +- .../main/java/org/apache/iotdb/tool/ExportCsv.java | 19 ++- .../apache/iotdb/cluster/metadata/CMManager.java | 68 ++++---- .../handlers/caller/ShowTimeSeriesHandler.java | 133 ++++++++++++++++ pom.xml | 6 +- .../db/exception/query/QueryProcessException.java | 4 + .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 4 + .../aggregation/impl/MinTimeDescAggrResult.java | 5 + .../iotdb/db/query/control/FileReaderManager.java | 110 ++++--------- .../dataset/RawQueryDataSetWithoutValueFilter.java | 14 +- .../db/query/udf/core/executor/UDTFExecutor.java | 6 + .../db/writelog/node/ExclusiveWriteLogNode.java | 8 + .../iotdb/db/engine/cache/ChunkCacheTest.java | 1 - .../db/engine/compaction/cross/MergeTest.java | 1 - .../compaction/inner/InnerCompactionTest.java | 1 - .../SizeTieredCompactionRecoverTest.java | 1 - .../inner/sizetiered/SizeTieredCompactionTest.java | 1 - .../compaction/utils/CompactionClearUtils.java | 1 - .../db/query/control/FileReaderManagerTest.java | 19 +-- .../query/reader/series/SeriesReaderTestUtil.java | 1 - .../iotdb/db/rescon/ResourceManagerTest.java | 1 - .../apache/iotdb/db/writelog/WriteLogNodeTest.java | 49 ++++++ .../tsfile/read/common/ExceptionBatchData.java | 10 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 11 ++ .../iotdb/tsfile/utils/ReadWriteIOUtilsTest.java | 30 +++- 33 files changed, 567 insertions(+), 361 deletions(-)
