This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TYQuery in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6515b4a2843629855ad9fbf9ffbb138199040d2b Merge: a463933 4ae74ae Author: JackieTien97 <[email protected]> AuthorDate: Fri Mar 12 19:23:09 2021 +0800 fix conflicts .../apache/iotdb/db/metadata/MLogTxtWriter.java | 32 ++ .../org/apache/iotdb/db/metadata/MManager.java | 8 + .../iotdb/db/metadata/MetadataOperationType.java | 1 + .../iotdb/db/metadata/logfile/MLogWriter.java | 8 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 13 + .../org/apache/iotdb/db/qp/logical/Operator.java | 1 + .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 5 + .../physical/sys/CreateAlignedTimeSeriesPlan.java | 249 ++++++++++++++++ .../org/apache/iotdb/db/service/TSServiceImpl.java | 54 ++++ .../org/apache/iotdb/db/tools/mlog/MLogParser.java | 4 + .../db/qp/physical/PhysicalPlanSerializeTest.java | 32 ++ .../iotdb/db/qp/physical/PhysicalPlanTest.java | 14 + .../writelog/recover/UnseqTsFileRecoverTest.java | 18 +- .../java/org/apache/iotdb/session/Session.java | 33 +++ .../apache/iotdb/session/SessionConnection.java | 20 ++ thrift/src/main/thrift/rpc.thrift | 12 + .../tsfile/write/schema/IMeasurementSchema.java | 1 + .../tsfile/write/schema/MeasurementSchema.java | 11 +- .../write/schema/VectorMeasurementSchema.java | 329 +++++++++++++++++++++ .../write/writer/VectorMeasurementSchemaStub.java | 4 + 20 files changed, 833 insertions(+), 16 deletions(-)
