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

caogaofei pushed a change to branch beyyes/agg_plan_device_cross_region
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 7f8c3023562 merge with master
     add 15d9cdcb7ed fix ut
     add 2b066d817f7 [IOTDB-6305] Add show current_timestamp statement  (#12106)
     add 9315aa01d24 Merge branch 'master' into 
beyyes/agg_plan_device_cross_region

No new revisions were added by this update.

Summary of changes:
 ...thIT.java => IoTDBSimpleQueryStandaloneIT.java} |  35 +++---
 .../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 |   1 +
 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |  10 +-
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4  |   4 +
 .../common/header/ColumnHeaderConstant.java        |   6 +
 .../common/header/DatasetHeaderFactory.java        |   4 +
 .../queryengine/plan/analyze/AnalyzeVisitor.java   |  11 ++
 .../memory/StatementMemorySourceVisitor.java       |  16 +++
 .../db/queryengine/plan/parser/ASTVisitor.java     |   6 +
 .../plan/statement/StatementVisitor.java           |   6 +
 ...ent.java => ShowCurrentTimestampStatement.java} |   9 +-
 .../distribution/AggregationDistributionTest.java  |   4 +-
 .../AlignByDeviceOrderByLimitOffsetTest.java       | 123 ++++++++++++++++-----
 13 files changed, 179 insertions(+), 56 deletions(-)
 copy 
integration-test/src/test/java/org/apache/iotdb/db/it/{strangepath/IoTDBStrangePathIT.java
 => IoTDBSimpleQueryStandaloneIT.java} (68%)
 copy 
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/{CountDevicesStatement.java
 => ShowCurrentTimestampStatement.java} (80%)

Reply via email to