You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/11/18 07:47:50 UTC
[iotdb] 02/04: Merge remote-tracking branch 'origin/master' into ty_new_vector
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty_new_vector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fe96097c7dbd412f77f6e2f5b291f3cebb45a408
Merge: 67ca536 96df186
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Wed Nov 17 11:18:47 2021 +0800
Merge remote-tracking branch 'origin/master' into ty_new_vector
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 8 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 70 +++++--
.../iotdb/cluster/coordinator/Coordinator.java | 8 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 21 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 10 +-
.../log/snapshot/MetaSimpleSnapshotTest.java | 2 +-
.../cluster/server/member/MetaGroupMemberTest.java | 2 +-
.../cluster/utils/CreateTemplatePlanUtil.java | 2 +-
docs/UserGuide/Appendix/SQL-Reference.md | 89 +++++++--
.../Data-Concept/Data-Model-and-Terminology.md | 32 +--
...{Measurement-Template.md => Schema-Template.md} | 20 +-
.../DDL-Data-Definition-Language.md | 75 +++++--
docs/zh/UserGuide/Appendix/SQL-Reference.md | 87 ++++++--
.../Data-Concept/Data-Model-and-Terminology.md | 30 ++-
...{Measurement-Template.md => Schema-Template.md} | 2 +-
.../DDL-Data-Definition-Language.md | 72 +++++--
.../iotdb/AlignedTimeseriesSessionExample.java | 9 +-
.../org/apache/iotdb/db/metadata/MManager.java | 56 +++---
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 19 +-
.../iotdb/db/metadata/logfile/MLogWriter.java | 18 +-
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 6 +-
.../iotdb/db/metadata/template/Template.java | 2 +-
.../db/metadata/template/TemplateManager.java | 6 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 10 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 51 +++--
.../org/apache/iotdb/db/qp/logical/Operator.java | 6 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 21 +-
.../qp/logical/sys/ActivateTemplateOperator.java | 51 +++++
.../sys/CreateAlignedTimeSeriesOperator.java | 131 ++++++++++++
.../db/qp/logical/sys/CreateTemplateOperator.java | 122 ++++++++++++
.../db/qp/logical/sys/SetTemplateOperator.java | 60 ++++++
.../db/qp/logical/sys/UnsetTemplateOperator.java | 60 ++++++
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 24 +--
...TemplatePlan.java => ActivateTemplatePlan.java} | 16 +-
.../physical/{crud => sys}/AppendTemplatePlan.java | 2 +-
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 35 ++--
.../physical/{crud => sys}/CreateTemplatePlan.java | 2 +-
.../physical/{crud => sys}/PruneTemplatePlan.java | 2 +-
.../SetTemplatePlan.java} | 16 +-
.../UnsetTemplatePlan.java} | 16 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 219 +++++++++++++++++++--
.../org/apache/iotdb/db/service/TSServiceImpl.java | 22 ++-
.../org/apache/iotdb/db/tools/mlog/MLogParser.java | 21 +-
.../IoTDBCreateAlignedTimeseriesIT.java | 106 ++++++++++
.../db/integration/IoTDBSchemaTemplateIT.java | 177 +++++++++++++++++
.../iotdb/db/metadata/MManagerBasicTest.java | 82 ++++----
.../org/apache/iotdb/db/metadata/TemplateTest.java | 9 +-
.../iotdb/db/metadata/mlog/MLogUpgraderTest.java | 2 +-
.../iotdb/db/qp/physical/InsertRowPlanTest.java | 6 +-
.../db/qp/physical/PhysicalPlanSerializeTest.java | 2 +-
.../org/apache/iotdb/db/tools/MLogParserTest.java | 17 +-
.../java/org/apache/iotdb/session/Session.java | 9 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 2 +-
.../session/IoTDBSessionVectorABDeviceIT.java | 4 +-
.../IoTDBSessionVectorAggregationWithUnSeqIT.java | 4 +-
.../apache/iotdb/session/template/TemplateUT.java | 2 +-
thrift/rpc-changelist.md | 4 +-
thrift/src/main/thrift/rpc.thrift | 2 +-
58 files changed, 1560 insertions(+), 401 deletions(-)