This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch VectorCodeSmell in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f25fac5691738d260e3db60ff976dd633f73bec5 Author: JackieTien97 <[email protected]> AuthorDate: Tue Apr 13 10:01:53 2021 +0800 fix some sonar --- .../iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java | 1 + .../org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java | 2 ++ .../org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java | 2 ++ .../org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java index dfe2ea5..dbcea9d 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithoutValueFilter.java @@ -516,6 +516,7 @@ public class RawQueryDataSetWithoutValueFilter extends QueryDataSet } /** for spark/hadoop/hive integration and test */ + @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning @Override public RowRecord nextWithoutConstraint() throws IOException { long minTime = timeHeap.pollFirst(); diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java index c27ce49..577e021 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java @@ -33,6 +33,8 @@ import java.util.Set; public class SeriesReaderFactory { + private SeriesReaderFactory() {} + public static SeriesReader createSeriesReader( PartialPath seriesPath, Set<String> allSensors, diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java index ec362a8..6de0150 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java @@ -90,6 +90,7 @@ public class VectorSeriesReader extends SeriesReader { this.vectorPartialPath = (VectorPartialPath) seriesPath; } + @Override protected void unpackSeqTsFileResource() throws IOException { TsFileResource resource = orderUtils.getNextSeqFileResource(seqFileResource, true); TimeseriesMetadata timeseriesMetadata = @@ -114,6 +115,7 @@ public class VectorSeriesReader extends SeriesReader { } } + @Override protected void unpackUnseqTsFileResource() throws IOException { TsFileResource resource = unseqFileResource.remove(0); TimeseriesMetadata timeseriesMetadata = diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java index 6e6f98e..dd5eea3 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/ValuePageReader.java @@ -82,7 +82,7 @@ public class ValuePageReader { public BatchData nextBatch(long[] timeBatch, boolean ascending, Filter filter) { BatchData pageData = BatchDataFactory.createBatchData(dataType, ascending, false); for (int i = 0; i < timeBatch.length; i++) { - if ((bitmap[i / 8] & (MASK >>> (i % 8))) == 0) { + if (((bitmap[i / 8] & 0xFF) & (MASK >>> (i % 8))) == 0) { continue; } long timestamp = timeBatch[i]; @@ -136,7 +136,7 @@ public class ValuePageReader { return valueBatch; } for (int i = 0; i < size; i++) { - if ((bitmap[i / 8] & (MASK >>> (i % 8))) == 0) { + if (((bitmap[i / 8] & 0xFF) & (MASK >>> (i % 8))) == 0) { continue; } switch (dataType) {
