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/05 08:51:23 UTC
[iotdb] branch new_vector updated: format code
This is an automated email from the ASF dual-hosted git repository.
jackietien 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 53dba1c format code
53dba1c is described below
commit 53dba1ccb0d34cf8cc7dd7f20a3a09d0828d873c
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri Nov 5 16:50:52 2021 +0800
format code
---
.../query/reader/chunk/metadata/DiskChunkMetadataLoader.java | 7 +++++--
.../main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java | 3 ++-
.../iotdb/tsfile/file/metadata/AlignedChunkMetadata.java | 6 ++++--
.../iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java | 7 +++++--
.../iotdb/tsfile/read/reader/page/AlignedPageReader.java | 10 +++++-----
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
index 00bc21f..b6ff733 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.query.reader.chunk.metadata;
-import java.util.List;
import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.metadata.path.PartialPath;
@@ -30,9 +29,12 @@ import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata;
import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata;
import org.apache.iotdb.tsfile.read.controller.IChunkMetadataLoader;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
public class DiskChunkMetadataLoader implements IChunkMetadataLoader {
private final TsFileResource resource;
@@ -54,7 +56,8 @@ public class DiskChunkMetadataLoader implements IChunkMetadataLoader {
@Override
public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeseriesMetadata) {
- List<IChunkMetadata> chunkMetadataList = ((TimeseriesMetadata)timeseriesMetadata).getChunkMetadataList();
+ List<IChunkMetadata> chunkMetadataList =
+ ((TimeseriesMetadata) timeseriesMetadata).getChunkMetadataList();
setDiskChunkLoader(chunkMetadataList, resource, seriesPath, context);
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
index 499c328..b5f8695 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
@@ -209,7 +209,8 @@ public class FileLoaderUtils {
}
}
- // TODO Modification should be applied to each aligned sensor instead of only applying to time column
+ // TODO Modification should be applied to each aligned sensor instead of only applying to time
+ // column
if (alignedTimeSeriesMetadata != null) {
List<Modification> pathModifications =
context.getPathModifications(resource.getModFile(), vectorPath);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java
index 5b31ea4..47330ef 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedChunkMetadata.java
@@ -183,8 +183,10 @@ public class AlignedChunkMetadata implements IChunkMetadata {
public List<Chunk> getValueChunkList() throws IOException {
List<Chunk> valueChunkList = new ArrayList<>();
for (IChunkMetadata chunkMetadata : valueChunkMetadataList) {
- valueChunkList.add(chunkMetadata == null ? null
- : chunkMetadata.getChunkLoader().loadChunk((ChunkMetadata) chunkMetadata));
+ valueChunkList.add(
+ chunkMetadata == null
+ ? null
+ : chunkMetadata.getChunkLoader().loadChunk((ChunkMetadata) chunkMetadata));
}
return valueChunkList;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java
index d04a35e..a9d3c67 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/AlignedChunkReader.java
@@ -127,7 +127,8 @@ public class AlignedChunkReader implements IChunkReader {
}
// if the current page satisfies
if (exits && pageSatisfied(timePageHeader)) {
- AlignedPageReader alignedPageReader = constructPageReaderForNextPage(timePageHeader, valuePageHeaderList);
+ AlignedPageReader alignedPageReader =
+ constructPageReaderForNextPage(timePageHeader, valuePageHeaderList);
if (alignedPageReader != null) {
pageReaderList.add(alignedPageReader);
}
@@ -172,7 +173,9 @@ public class AlignedChunkReader implements IChunkReader {
valuePageDataList.add(null);
valueDataTypeList.add(null);
valueDecoderList.add(null);
- } else if (pageSatisfied(valuePageHeader.get(i), valueDeleteIntervalList.get(i))) { // if the page is satisfied, deserialize it
+ } else if (pageSatisfied(
+ valuePageHeader.get(i),
+ valueDeleteIntervalList.get(i))) { // if the page is satisfied, deserialize it
getPageInfo(
valuePageHeader.get(i),
valueChunkDataBufferList.get(i),
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java
index 78e432a..8add1f3 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/AlignedPageReader.java
@@ -67,7 +67,6 @@ public class AlignedPageReader implements IPageReader {
} else {
valuePageReaderList.add(null);
}
-
}
this.filter = filter;
this.valueCount = valuePageReaderList.size();
@@ -78,14 +77,15 @@ public class AlignedPageReader implements IPageReader {
long[] timeBatch = timePageReader.nexTimeBatch();
// if the vector contains only one sub sensor, just return a common BatchData whose DataType is
// same as the only one sub sensor.
-// if (valuePageReaderList.size() == 1) {
-// return valuePageReaderList.get(0).nextBatch(timeBatch, ascending, filter);
-// }
+ // if (valuePageReaderList.size() == 1) {
+ // return valuePageReaderList.get(0).nextBatch(timeBatch, ascending, filter);
+ // }
// if the vector contains more than on sub sensor, the BatchData's DataType is Vector
List<TsPrimitiveType[]> valueBatchList = new ArrayList<>(valueCount);
for (ValuePageReader valuePageReader : valuePageReaderList) {
- valueBatchList.add(valuePageReader == null ? null : valuePageReader.nextValueBatch(timeBatch));
+ valueBatchList.add(
+ valuePageReader == null ? null : valuePageReader.nextValueBatch(timeBatch));
}
BatchData pageData = BatchDataFactory.createBatchData(TSDataType.VECTOR, ascending, false);
boolean isNull;