This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch clean_package
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 9eb9aabb16 resolve conflict
add a4a8656cec [IOTDB-2981] Modify antlr, IoTDBSqlVisitor and ASTVisitor
for new syntax convention (#5696)
add 27041effb1 Merge branch 'master' into clean_package
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 9 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 138 ++--
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 15 +-
.../iotdb/cluster/metadata/CSchemaProcessor.java | 6 +-
.../cluster/query/ClusterDataQueryExecutor.java | 6 +-
.../query/aggregate/ClusterAggregateExecutor.java | 2 +-
.../cluster/query/fill/ClusterFillExecutor.java | 2 +-
.../groupby/ClusterGroupByVFilterDataSet.java | 2 +-
.../cluster/query/reader/ClusterReaderFactory.java | 3 +-
.../cluster/query/reader/ClusterTimeGenerator.java | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 35 +-
docs/UserGuide/Query-Data/Without-Null.md | 8 +-
docs/UserGuide/Reference/Syntax-Conventions.md | 453 ++++++++---
.../Data-Concept/Data-Model-and-Terminology.md | 30 +-
docs/zh/UserGuide/Query-Data/Without-Null.md | 8 +-
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 492 +++++++++---
.../org/apache/iotdb/DataMigrationExample.java | 2 +-
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 2 +-
.../org/apache/iotdb/db/integration/IoTDBAsIT.java | 2 +-
.../db/integration/IoTDBCreateTimeseriesIT.java | 18 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 16 +-
.../iotdb/db/integration/IoTDBExecuteBatchIT.java | 6 +-
.../db/integration/IoTDBFloatPrecisionIT.java | 2 +-
.../iotdb/db/integration/IoTDBInsertNaNIT.java | 2 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 8 +-
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 24 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 29 +-
.../integration/IoTDBSortedShowTimeseriesIT.java | 38 +-
.../db/integration/IoTDBSyntaxConventionIT.java | 468 ------------
.../IoTDBSyntaxConventionIdentifierIT.java | 838 +++++++++++++++++++++
.../IoTDBSyntaxConventionStringLiteralIT.java | 764 +++++++++++++++++++
.../iotdb/db/integration/IoTDBTagAlterIT.java | 46 +-
.../apache/iotdb/db/integration/IoTDBTagIT.java | 220 ++++--
.../aggregation/IoTDBAggregationIT.java | 5 +
.../db/integration/aligned/IoTDBDeletionIT.java | 16 +-
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 6 +-
.../IoTDBSyntaxConventionVersionAdaptionIT.java | 100 ---
.../IoTDBWithoutNullAllFilterIT.java | 16 +-
.../IoTDBWithoutNullAnyFilterIT.java | 8 +-
.../session/IoTDBSessionSyntaxConventionIT.java | 39 +-
.../utils/SingleSeriesCompactionExecutor.java | 2 +-
.../iotdb/db/engine/modification/Modification.java | 2 +-
.../selectinto/InsertTabletPlansIterator.java | 2 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 9 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 10 +-
.../iotdb/db/metadata/path/MeasurementPath.java | 13 +-
.../apache/iotdb/db/metadata/path/PartialPath.java | 32 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 17 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 82 +-
.../db/metadata/utils/ResourceByPathUtils.java | 9 +-
.../iotdb/db/mpp/execution/driver/DataDriver.java | 2 +-
.../execution/operator/source/SeriesScanUtil.java | 23 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 267 ++++---
.../node/metedata/write/AlterTimeSeriesNode.java | 3 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 2 +-
.../plan/node/source/AlignedSeriesScanNode.java | 10 +-
.../plan/statement/component/SelectComponent.java | 4 +-
.../statement/crud/AggregationQueryStatement.java | 2 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 2 +-
.../db/protocol/influxdb/handler/QueryHandler.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 9 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 316 ++++----
.../db/query/control/QueryResourceManager.java | 6 +-
.../groupby/GroupByWithValueFilterDataSet.java | 2 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 2 +-
.../db/query/executor/AggregationExecutor.java | 6 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 4 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 2 +-
.../db/query/executor/RawDataQueryExecutor.java | 4 +-
.../db/query/executor/fill/LastPointReader.java | 6 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 18 +-
.../query/timegenerator/ServerTimeGenerator.java | 2 +-
.../iotdb/db/sync/sender/pipe/IoTDBPipeSink.java | 4 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 2 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 4 +-
.../file/UnsealedTsFileRecoverPerformer.java | 2 +-
.../compaction/utils/CompactionCheckerUtils.java | 2 +-
.../utils/CompactionFileGeneratorUtils.java | 6 +-
.../apache/iotdb/db/metadata/MetaUtilsTest.java | 71 +-
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 24 +-
.../rocksdb/RocksDBBenchmarkEngine.java | 2 +-
.../iotdb/db/mpp/plan/analyze/AnalyzerTest.java | 2 +-
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 24 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 6 +-
.../iotdb/db/query/dataset/ListDataSetTest.java | 2 +-
.../iotdb/db/query/dataset/SingleDataSetTest.java | 2 +-
.../query/dataset/groupby/GroupByDataSetTest.java | 4 +-
.../dataset/groupby/GroupByLevelDataSetTest.java | 4 +-
.../apache/iotdb/spark/tsfile/DefaultSource.scala | 2 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 2 +-
.../apache/iotdb/spark/tsfile/WideConverter.scala | 4 +-
.../tsfile/common/constant/TsFileConstant.java | 1 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 10 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 2 +-
.../read/controller/MetadataQuerierByFileImpl.java | 8 +-
.../tsfile/v2/read/TsFileSequenceReaderForV2.java | 7 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 8 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 2 +-
.../apache/iotdb/tsfile/read/TsFileReaderTest.java | 2 +-
.../apache/iotdb/tsfile/read/common/PathTest.java | 10 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 6 +-
104 files changed, 3416 insertions(+), 1575 deletions(-)
delete mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSyntaxConventionIT.java
create mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSyntaxConventionIdentifierIT.java
create mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSyntaxConventionStringLiteralIT.java
delete mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBSyntaxConventionVersionAdaptionIT.java
