This is an automated email from the ASF dual-hosted git repository. rong pushed a change to branch iotdb-3227 in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 868c43cc26 merge master and fix conflicts
add 152f4f142b fix CI
No new revisions were added by this update.
Summary of changes:
.../antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +-
.../org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
