This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch new_vector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_vector by this push:
new baa8d66 Fix compile
baa8d66 is described below
commit baa8d66990638ff8d114efd84b2a589055f00965
Author: HTHou <[email protected]>
AuthorDate: Thu Oct 28 16:54:32 2021 +0800
Fix compile
---
.../iotdb/db/engine/flush/MemTableFlushTask.java | 18 +++----
.../iotdb/db/engine/memtable/AbstractMemTable.java | 48 +++++++++++--------
.../apache/iotdb/db/engine/memtable/IMemTable.java | 4 +-
.../db/engine/memtable/IWritableMemChunk.java | 9 +++-
.../db/engine/memtable/VectorWritableMemChunk.java | 55 +++++++++-------------
.../iotdb/db/engine/memtable/WritableMemChunk.java | 23 +++++----
.../db/engine/storagegroup/TsFileProcessor.java | 25 +++++-----
.../iotdb/db/utils/datastructure/VectorTVList.java | 12 +++--
.../db/engine/memtable/PrimitiveMemTableTest.java | 7 +--
.../tsfile/write/schema/IMeasurementSchema.java | 14 +++---
.../write/schema/UnaryMeasurementSchema.java | 28 +++++------
.../write/schema/VectorMeasurementSchema.java | 34 +++++++------
.../write/writer/VectorMeasurementSchemaStub.java | 4 +-
13 files changed, 141 insertions(+), 140 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 30e878a..957d03e 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@ -18,13 +18,6 @@
*/
package org.apache.iotdb.db.engine.flush;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.flush.pool.FlushSubTaskPoolManager;
@@ -32,15 +25,18 @@ import org.apache.iotdb.db.engine.memtable.IMemTable;
import org.apache.iotdb.db.engine.memtable.IWritableMemChunk;
import org.apache.iotdb.db.exception.runtime.FlushRunTimeException;
import org.apache.iotdb.db.rescon.SystemInfo;
-import org.apache.iotdb.db.utils.datastructure.TVList;
-import org.apache.iotdb.db.utils.datastructure.VectorTVList;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
import org.apache.iotdb.tsfile.write.chunk.IChunkWriter;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+
/**
* flush task to flush one memtable using a pipeline model to flush, which is
sort memtable ->
* encoding -> write to disk (io task)
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 686e085..eb8dcd4 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -104,7 +104,8 @@ public abstract class AbstractMemTable implements IMemTable
{
* @param schema measurement schema
* @return this MemChunk
*/
- private IWritableMemChunk createMemChunkIfNotExistAndGet(String deviceId,
IMeasurementSchema schema) {
+ private IWritableMemChunk createMemChunkIfNotExistAndGet(
+ String deviceId, IMeasurementSchema schema) {
Map<String, IWritableMemChunk> memSeries =
memTableMap.computeIfAbsent(deviceId, k -> new HashMap<>());
@@ -147,7 +148,7 @@ public abstract class AbstractMemTable implements IMemTable
{
@Override
public void insertAlignedRow(InsertRowPlan insertRowPlan) {
updatePlanIndexes(insertRowPlan.getIndex());
- // write vector
+ // write vector
List<String> measurements = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
List<TSEncoding> encodings = new ArrayList<>();
@@ -163,13 +164,13 @@ public abstract class AbstractMemTable implements
IMemTable {
compressionType = schema.getCompressor();
}
VectorMeasurementSchema vectorSchema =
- new VectorMeasurementSchema(null, measurements.toArray(new
String[measurements.size()]),
- types.toArray(new TSDataType[measurements.size()]),
encodings.toArray(new TSEncoding[measurements.size()]), compressionType);
- memSize +=
- MemUtils.getVectorRecordSize(
- types,
- insertRowPlan.getValues(),
- disableMemControl);
+ new VectorMeasurementSchema(
+ null,
+ measurements.toArray(new String[measurements.size()]),
+ types.toArray(new TSDataType[measurements.size()]),
+ encodings.toArray(new TSEncoding[measurements.size()]),
+ compressionType);
+ memSize += MemUtils.getVectorRecordSize(types, insertRowPlan.getValues(),
disableMemControl);
writeAlignedRow(
insertRowPlan.getPrefixPath().getFullPath(),
vectorSchema,
@@ -217,7 +218,8 @@ public abstract class AbstractMemTable implements IMemTable
{
}
@Override
- public void writeAlignedRow(String deviceId, IMeasurementSchema schema, long
insertTime, Object objectValue) {
+ public void writeAlignedRow(
+ String deviceId, IMeasurementSchema schema, long insertTime, Object
objectValue) {
IWritableMemChunk memSeries = createMemChunkIfNotExistAndGet(deviceId,
schema);
memSeries.write(insertTime, objectValue);
}
@@ -237,9 +239,7 @@ public abstract class AbstractMemTable implements IMemTable
{
memSeries.write(
insertTabletPlan.getTimes(),
insertTabletPlan.getColumns()[i],
- insertTabletPlan.getBitMaps() != null
- ? insertTabletPlan.getBitMaps()[i]
- : null,
+ insertTabletPlan.getBitMaps() != null ?
insertTabletPlan.getBitMaps()[i] : null,
insertTabletPlan.getDataTypes()[i],
start,
end);
@@ -263,12 +263,22 @@ public abstract class AbstractMemTable implements
IMemTable {
compressionType = schema.getCompressor();
}
VectorMeasurementSchema vectorSchema =
- new VectorMeasurementSchema(null, measurements.toArray(new
String[measurements.size()]),
- types.toArray(new TSDataType[measurements.size()]),
encodings.toArray(new TSEncoding[measurements.size()]), compressionType);
- IWritableMemChunk memSeries = createMemChunkIfNotExistAndGet(
- insertTabletPlan.getPrefixPath().getFullPath(), vectorSchema);
- memSeries.writeVector(insertTabletPlan.getTimes(),
insertTabletPlan.getMeasurements(),
- insertTabletPlan.getColumns(), insertTabletPlan.getBitMaps(), start,
end);
+ new VectorMeasurementSchema(
+ null,
+ measurements.toArray(new String[measurements.size()]),
+ types.toArray(new TSDataType[measurements.size()]),
+ encodings.toArray(new TSEncoding[measurements.size()]),
+ compressionType);
+ IWritableMemChunk memSeries =
+ createMemChunkIfNotExistAndGet(
+ insertTabletPlan.getPrefixPath().getFullPath(), vectorSchema);
+ memSeries.writeVector(
+ insertTabletPlan.getTimes(),
+ insertTabletPlan.getMeasurements(),
+ insertTabletPlan.getColumns(),
+ insertTabletPlan.getBitMaps(),
+ start,
+ end);
}
@Override
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
index 646f67c..b1d9f2e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
@@ -46,7 +46,8 @@ public interface IMemTable {
void write(String deviceId, IMeasurementSchema schema, long insertTime,
Object objectValue);
- void writeAlignedRow(String deviceId, IMeasurementSchema schema, long
insertTime, Object objectValue);
+ void writeAlignedRow(
+ String deviceId, IMeasurementSchema schema, long insertTime, Object
objectValue);
/**
* write data in the range [start, end). Null value in each column values
will be replaced by the
* subsequent non-null value, e.g., {1, null, 3, null, 5} will be {1, 3, 5,
null, 5}
@@ -162,5 +163,4 @@ public interface IMemTable {
long getMinPlanIndex();
long getCreatedTime();
-
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
index cf276ad..c3fbe96 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
@@ -66,7 +66,13 @@ public interface IWritableMemChunk {
void write(
long[] times, Object valueList, BitMap bitMap, TSDataType dataType, int
start, int end);
- void writeVector(long[] times, String[] measurements, Object[] valueList,
BitMap[] bitMaps, int start, int end);
+ void writeVector(
+ long[] times,
+ String[] measurements,
+ Object[] valueList,
+ BitMap[] bitMaps,
+ int start,
+ int end);
long count();
@@ -101,7 +107,6 @@ public interface IWritableMemChunk {
/**
* served for flush requests. The logic is just same as
getSortedTVListForQuery, but without add
* reference count
- *
*/
void sortTvListForFlush();
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
index 5b2e8aa..8a2a815 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
@@ -1,9 +1,5 @@
package org.apache.iotdb.db.engine.memtable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.apache.iotdb.db.rescon.TVListAllocator;
import org.apache.iotdb.db.utils.datastructure.TVList;
import org.apache.iotdb.db.utils.datastructure.VectorTVList;
@@ -14,11 +10,17 @@ import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.chunk.IChunkWriter;
import org.apache.iotdb.tsfile.write.chunk.VectorChunkWriterImpl;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class VectorWritableMemChunk implements IWritableMemChunk {
-
+
private IMeasurementSchema schema;
private VectorTVList list;
private Map<String, Integer> VectorIdIndexMap;
@@ -110,13 +112,18 @@ public class VectorWritableMemChunk implements
IWritableMemChunk {
}
@Override
- public void write(long[] times, Object valueList, BitMap bitMap, TSDataType
dataType, int start,
- int end) {
+ public void write(
+ long[] times, Object valueList, BitMap bitMap, TSDataType dataType, int
start, int end) {
throw new UnSupportedDataTypeException(UNSUPPORTED_TYPE +
schema.getType());
}
@Override
- public void writeVector(long[] times, String[] measurementIds, Object[]
valueList, BitMap[] bitMaps, int start,
+ public void writeVector(
+ long[] times,
+ String[] measurementIds,
+ Object[] valueList,
+ BitMap[] bitMaps,
+ int start,
int end) {
checkColumnOrder(measurementIds);
putVectors(times, valueList, bitMaps, start, end);
@@ -193,8 +200,7 @@ public class VectorWritableMemChunk implements
IWritableMemChunk {
long time = list.getTime(sortedRowIndex);
// skip duplicated data
- if ((sortedRowIndex + 1 < list.size()
- && (time == list.getTime(sortedRowIndex + 1)))) {
+ if ((sortedRowIndex + 1 < list.size() && (time ==
list.getTime(sortedRowIndex + 1)))) {
// record the time duplicated row index list for vector type
if (timeDuplicatedVectorRowIndexList == null) {
timeDuplicatedVectorRowIndexList = new ArrayList<>();
@@ -217,39 +223,24 @@ public class VectorWritableMemChunk implements
IWritableMemChunk {
switch (dataTypes.get(columnIndex)) {
case BOOLEAN:
chunkWriter.write(
- time,
- list.getBooleanByValueIndex(originRowIndex, columnIndex),
- isNull);
+ time, list.getBooleanByValueIndex(originRowIndex,
columnIndex), isNull);
break;
case INT32:
- chunkWriter.write(
- time,
- list.getIntByValueIndex(originRowIndex, columnIndex),
- isNull);
+ chunkWriter.write(time, list.getIntByValueIndex(originRowIndex,
columnIndex), isNull);
break;
case INT64:
- chunkWriter.write(
- time,
- list.getLongByValueIndex(originRowIndex, columnIndex),
- isNull);
+ chunkWriter.write(time, list.getLongByValueIndex(originRowIndex,
columnIndex), isNull);
break;
case FLOAT:
- chunkWriter.write(
- time,
- list.getFloatByValueIndex(originRowIndex, columnIndex),
- isNull);
+ chunkWriter.write(time, list.getFloatByValueIndex(originRowIndex,
columnIndex), isNull);
break;
case DOUBLE:
chunkWriter.write(
- time,
- list.getDoubleByValueIndex(originRowIndex, columnIndex),
- isNull);
+ time, list.getDoubleByValueIndex(originRowIndex, columnIndex),
isNull);
break;
case TEXT:
chunkWriter.write(
- time,
- list.getBinaryByValueIndex(originRowIndex, columnIndex),
- isNull);
+ time, list.getBinaryByValueIndex(originRowIndex, columnIndex),
isNull);
break;
default:
LOGGER.error(
@@ -261,7 +252,5 @@ public class VectorWritableMemChunk implements
IWritableMemChunk {
chunkWriter.write(time);
timeDuplicatedVectorRowIndexList = null;
}
-
}
-
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
index 6167216..9561515 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
@@ -27,8 +27,10 @@ import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
import org.apache.iotdb.tsfile.write.chunk.IChunkWriter;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import java.util.List;
public class WritableMemChunk implements IWritableMemChunk {
@@ -102,10 +104,14 @@ public class WritableMemChunk implements
IWritableMemChunk {
}
}
-
@Override
- public void writeVector(long[] times, String[] measurements, Object[]
valueList, BitMap[] bitMaps,
- int start, int end) {
+ public void writeVector(
+ long[] times,
+ String[] measurements,
+ Object[] valueList,
+ BitMap[] bitMaps,
+ int start,
+ int end) {
throw new UnSupportedDataTypeException(UNSUPPORTED_TYPE +
list.getDataType());
}
@@ -257,11 +263,6 @@ public class WritableMemChunk implements IWritableMemChunk
{
}
@Override
- public void encode(IChunkWriter chunkWriter) {
-
- }
-
- @Override
public String toString() {
int size = list.size();
int firstIndex = 0;
@@ -300,8 +301,7 @@ public class WritableMemChunk implements IWritableMemChunk {
long time = list.getTime(sortedRowIndex);
// skip duplicated data
- if ((sortedRowIndex + 1 < list.size()
- && (time == list.getTime(sortedRowIndex + 1)))) {
+ if ((sortedRowIndex + 1 < list.size() && (time ==
list.getTime(sortedRowIndex + 1)))) {
continue;
}
@@ -330,8 +330,7 @@ public class WritableMemChunk implements IWritableMemChunk {
chunkWriter.write(time, list.getBinary(sortedRowIndex), false);
break;
default:
- LOGGER.error(
- "WritableMemChunk does not support data type: {}",
schema.getType());
+ LOGGER.error("WritableMemChunk does not support data type: {}",
schema.getType());
break;
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index be6c337..32ed705 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -18,16 +18,6 @@
*/
package org.apache.iotdb.db.engine.storagegroup;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -75,9 +65,21 @@ import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
@SuppressWarnings("java:S1135") // ignore todos
public class TsFileProcessor {
@@ -1257,7 +1259,8 @@ public class TsFileProcessor {
modificationFile,
new PartialPath(deviceId + IoTDBConstant.PATH_SEPARATOR +
measurementId));
- List<IChunkMetadata> chunkMetadataList =
schema.getVisibleMetadataListFromWriter(writer, deviceId);
+ List<IChunkMetadata> chunkMetadataList =
+ schema.getVisibleMetadataListFromWriter(writer, deviceId);
QueryUtils.modifyChunkMetaData(chunkMetadataList, modifications);
chunkMetadataList.removeIf(context::chunkNotSatisfy);
diff --git
a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/VectorTVList.java
b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/VectorTVList.java
index 5ba633b..c786c8f 100644
---
a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/VectorTVList.java
+++
b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/VectorTVList.java
@@ -19,10 +19,6 @@
package org.apache.iotdb.db.utils.datastructure;
-import static org.apache.iotdb.db.rescon.PrimitiveArrayManager.ARRAY_SIZE;
-
-import java.util.ArrayList;
-import java.util.List;
import org.apache.iotdb.db.rescon.PrimitiveArrayManager;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
@@ -31,6 +27,11 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.utils.TsPrimitiveType;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.iotdb.db.rescon.PrimitiveArrayManager.ARRAY_SIZE;
+
public class VectorTVList extends TVList {
// data types of this vector
@@ -136,7 +137,8 @@ public class VectorTVList extends TVList {
validIndexesForTimeDuplicatedRows);
}
- private TsPrimitiveType getVectorByValueIndex(int valueIndex, int[]
validIndexesForTimeDuplicatedRows) {
+ private TsPrimitiveType getVectorByValueIndex(
+ int valueIndex, int[] validIndexesForTimeDuplicatedRows) {
if (valueIndex >= size) {
throw new ArrayIndexOutOfBoundsException(valueIndex);
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
index f2aa26e..1ee2c61 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
@@ -27,7 +27,6 @@ import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
import org.apache.iotdb.db.metadata.mnode.MeasurementMNode;
import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan;
import org.apache.iotdb.db.utils.MathUtils;
-import org.apache.iotdb.db.utils.datastructure.TVList;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -65,8 +64,7 @@ public class PrimitiveMemTableTest {
public void memSeriesSortIteratorTest() throws IOException {
TSDataType dataType = TSDataType.INT32;
WritableMemChunk series =
- new WritableMemChunk(
- new UnaryMeasurementSchema("s1", dataType, TSEncoding.PLAIN));
+ new WritableMemChunk(new UnaryMeasurementSchema("s1", dataType,
TSEncoding.PLAIN));
int count = 1000;
for (int i = 0; i < count; i++) {
series.write(i, i);
@@ -84,8 +82,7 @@ public class PrimitiveMemTableTest {
public void memSeriesToStringTest() throws IOException {
TSDataType dataType = TSDataType.INT32;
WritableMemChunk series =
- new WritableMemChunk(
- new UnaryMeasurementSchema("s1", dataType, TSEncoding.PLAIN));
+ new WritableMemChunk(new UnaryMeasurementSchema("s1", dataType,
TSEncoding.PLAIN));
int count = 100;
for (int i = 0; i < count; i++) {
series.write(i, i);
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 88449b1..1e8920f 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
@@ -18,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.schema;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -30,6 +25,12 @@ import
org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+
public interface IMeasurementSchema {
String getMeasurementId();
@@ -69,7 +70,8 @@ public interface IMeasurementSchema {
int serializeTo(OutputStream outputStream) throws IOException;
- List<IChunkMetadata>
getVisibleMetadataListFromWriter(RestorableTsFileIOWriter writer, String
deviceId);
+ List<IChunkMetadata> getVisibleMetadataListFromWriter(
+ RestorableTsFileIOWriter writer, String deviceId);
/*
1. used in cluster module to avoid useless field transfer(such as props in
MeasurementSchema)
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
index 366881d9..d3090ba 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
@@ -18,16 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.schema;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder;
@@ -39,6 +29,17 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.utils.StringContainer;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
/**
* This class describes a measurement's information registered in {@linkplain
Schema FileSchema},
* including measurement id, data type, encoding and compressor type. For each
TSEncoding,
@@ -290,10 +291,9 @@ public class UnaryMeasurementSchema
}
@Override
- public List<IChunkMetadata>
getVisibleMetadataListFromWriter(RestorableTsFileIOWriter writer,
- String deviceId) {
- return new ArrayList<>(
- writer.getVisibleMetadataList(deviceId, measurementId, getType()));
+ public List<IChunkMetadata> getVisibleMetadataListFromWriter(
+ RestorableTsFileIOWriter writer, String deviceId) {
+ return new ArrayList<>(writer.getVisibleMetadataList(deviceId,
measurementId, getType()));
}
/** function for serializing data to byte buffer. */
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
index 0cf5c69..e6bae26 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/VectorMeasurementSchema.java
@@ -19,17 +19,6 @@
package org.apache.iotdb.tsfile.write.schema;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder;
@@ -43,6 +32,18 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.utils.StringContainer;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
public class VectorMeasurementSchema
implements IMeasurementSchema, Comparable<VectorMeasurementSchema>,
Serializable {
@@ -53,8 +54,7 @@ public class VectorMeasurementSchema
private TSEncodingBuilder[] encodingConverters;
private byte compressor;
- public VectorMeasurementSchema() {
- }
+ public VectorMeasurementSchema() {}
public VectorMeasurementSchema(
String vectorMeasurementId,
@@ -266,8 +266,8 @@ public class VectorMeasurementSchema
}
@Override
- public List<IChunkMetadata>
getVisibleMetadataListFromWriter(RestorableTsFileIOWriter writer,
- String deviceId) {
+ public List<IChunkMetadata> getVisibleMetadataListFromWriter(
+ RestorableTsFileIOWriter writer, String deviceId) {
List<IChunkMetadata> chunkMetadataList = new ArrayList<>();
List<ChunkMetadata> timeChunkMetadataList =
writer.getVisibleMetadataList(deviceId, "", getType());
@@ -383,9 +383,7 @@ public class VectorMeasurementSchema
return Objects.hash(vectorMeasurementId, types, encodings, compressor);
}
- /**
- * compare by vector name
- */
+ /** compare by vector name */
@Override
public int compareTo(VectorMeasurementSchema o) {
if (equals(o)) {
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 2b1051e..2128a46 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
@@ -113,8 +113,8 @@ public class VectorMeasurementSchemaStub implements
IMeasurementSchema {
}
@Override
- public List<IChunkMetadata>
getVisibleMetadataListFromWriter(RestorableTsFileIOWriter writer,
- String deviceId) {
+ public List<IChunkMetadata> getVisibleMetadataListFromWriter(
+ RestorableTsFileIOWriter writer, String deviceId) {
return null;
}
