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/03/12 11:24:12 UTC
[iotdb] branch TYQuery updated (a463933 -> ec70119)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch TYQuery
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from a463933 format code
add 8c9b82a [To Vector] Finish the tsfile read module (#2819)
add 4ae74ae [PhysicalPlan] Add PhysicalPlan
new 6515b4a fix conflicts
new ec70119 format
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 +
.../java/org/apache/iotdb/session/Session.java | 33 +++
.../apache/iotdb/session/SessionConnection.java | 20 ++
thrift/src/main/thrift/rpc.thrift | 12 +
.../tsfile/write/schema/MeasurementSchema.java | 11 +-
.../write/schema/VectorMeasurementSchema.java | 329 +++++++++++++++++++++
17 files changed, 820 insertions(+), 6 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateAlignedTimeSeriesPlan.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
[iotdb] 02/02: format
Posted by ja...@apache.org.
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 ec7011962c611c481363e0704181468abefc7bad
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri Mar 12 19:23:49 2021 +0800
format
---
.../db/writelog/recover/UnseqTsFileRecoverTest.java | 18 ++++++++++--------
.../iotdb/tsfile/write/schema/IMeasurementSchema.java | 1 -
.../write/writer/VectorMeasurementSchemaStub.java | 4 ----
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
index a2d3539..77f7940 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
@@ -19,14 +19,6 @@
package org.apache.iotdb.db.writelog.recover;
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.util.Collections;
-import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
@@ -65,10 +57,20 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
+
+import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
public class UnseqTsFileRecoverTest {
private File tsF;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
index ee23bef..c6bad29 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
-
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
index 9982c30..0780f40 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
@@ -18,10 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Map;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
[iotdb] 01/02: fix conflicts
Posted by ja...@apache.org.
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 <Ja...@foxmail.com>
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(-)