This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 0069fc3 Fix checkstyle violation and limit the prefix inc/dec check
in for look (#7451)
0069fc3 is described below
commit 0069fc3545b558cf7e49bccac4bf37a614433e48
Author: Xiaotian (Jackie) Jiang <17555551+jackie-ji...@users.noreply.github.com>
AuthorDate: Fri Sep 17 19:42:19 2021 -0700
Fix checkstyle violation and limit the prefix inc/dec check in for look
(#7451)
---
config/checkstyle.xml | 8 +++---
.../index/creator/RangeIndexCreatorTest.java | 31 +++++++++++-----------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 3bbfd9b..06012d7 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -99,9 +99,11 @@
<module name="StringLiteralEquality"/>
<!-- Use 'L' with long literals -->
<module name="UpperEll"/>
- <!-- ban prefix increment, decrement -->
- <module name="IllegalToken">
- <property name="tokens" value="INC,DEC"/>
+ <!-- Do not use prefix increment, decrement in for loop iterator -->
+ <module name="DescendantToken">
+ <property name="tokens" value="FOR_ITERATOR"/>
+ <property name="limitedTokens" value="INC,DEC"/>
+ <property name="maximumNumber" value="0"/>
</module>
<!-- IMPORTS -->
diff --git
a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RangeIndexCreatorTest.java
b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RangeIndexCreatorTest.java
index 956b1c9..5bee897 100644
---
a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RangeIndexCreatorTest.java
+++
b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/RangeIndexCreatorTest.java
@@ -37,7 +37,9 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static
org.apache.pinot.segment.spi.V1Constants.Indexes.BITMAP_RANGE_INDEX_FILE_EXTENSION;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
public class RangeIndexCreatorTest {
@@ -243,7 +245,7 @@ public class RangeIndexCreatorTest {
}
private void verifyRangesForDataType(DataType dataType, Object values,
Object ranges, int numValuesPerMVEntry,
-
RangeIndexReader<ImmutableRoaringBitmap> rangeIndexReader) {
+ RangeIndexReader<ImmutableRoaringBitmap> rangeIndexReader) {
switch (dataType) {
case INT: {
// single bucket ranges
@@ -256,14 +258,14 @@ public class RangeIndexCreatorTest {
for (int docId : partialMatches.toArray()) {
checkValueForDocId(dataType, values, ranges, rangeId, docId,
numValuesPerMVEntry);
}
- ++rangeId;
+ rangeId++;
}
// multi bucket ranges
int[] lowerPartialRange = ((int[][]) ranges)[0];
int[] coveredRange = ((int[][]) ranges)[1];
int[] upperPartialRange = ((int[][]) ranges)[2];
ImmutableRoaringBitmap matches =
rangeIndexReader.getMatchingDocIds(lowerPartialRange[0], upperPartialRange[1]);
- assertNotNull(matches, "matches for covered range must not be null");
+ assertNotNull(matches, "matches for covered range must not be null");
for (int docId : matches.toArray()) {
checkValueForDocId(dataType, values, ranges, 1, docId,
numValuesPerMVEntry);
}
@@ -298,14 +300,14 @@ public class RangeIndexCreatorTest {
for (int docId : partialMatches.toArray()) {
checkValueForDocId(dataType, values, ranges, rangeId, docId,
numValuesPerMVEntry);
}
- ++rangeId;
+ rangeId++;
}
// multi bucket ranges
long[] lowerPartialRange = ((long[][]) ranges)[0];
long[] coveredRange = ((long[][]) ranges)[1];
long[] upperPartialRange = ((long[][]) ranges)[2];
ImmutableRoaringBitmap matches =
rangeIndexReader.getMatchingDocIds(lowerPartialRange[0], upperPartialRange[1]);
- assertNotNull(matches, "matches for covered range must not be null");
+ assertNotNull(matches, "matches for covered range must not be null");
for (int docId : matches.toArray()) {
checkValueForDocId(dataType, values, ranges, 1, docId,
numValuesPerMVEntry);
}
@@ -340,14 +342,14 @@ public class RangeIndexCreatorTest {
for (int docId : partialMatches.toArray()) {
checkValueForDocId(dataType, values, ranges, rangeId, docId,
numValuesPerMVEntry);
}
- ++rangeId;
+ rangeId++;
}
// multi bucket ranges
float[] lowerPartialRange = ((float[][]) ranges)[0];
float[] coveredRange = ((float[][]) ranges)[1];
float[] upperPartialRange = ((float[][]) ranges)[2];
ImmutableRoaringBitmap matches =
rangeIndexReader.getMatchingDocIds(lowerPartialRange[0], upperPartialRange[1]);
- assertNotNull(matches, "matches for covered range must not be null");
+ assertNotNull(matches, "matches for covered range must not be null");
for (int docId : matches.toArray()) {
checkValueForDocId(dataType, values, ranges, 1, docId,
numValuesPerMVEntry);
}
@@ -382,14 +384,14 @@ public class RangeIndexCreatorTest {
for (int docId : partialMatches.toArray()) {
checkValueForDocId(dataType, values, ranges, rangeId, docId,
numValuesPerMVEntry);
}
- ++rangeId;
+ rangeId++;
}
// multi bucket ranges
double[] lowerPartialRange = ((double[][]) ranges)[0];
double[] coveredRange = ((double[][]) ranges)[1];
double[] upperPartialRange = ((double[][]) ranges)[2];
ImmutableRoaringBitmap matches =
rangeIndexReader.getMatchingDocIds(lowerPartialRange[0], upperPartialRange[1]);
- assertNotNull(matches, "matches for covered range must not be null");
+ assertNotNull(matches, "matches for covered range must not be null");
for (int docId : matches.toArray()) {
checkValueForDocId(dataType, values, ranges, 1, docId,
numValuesPerMVEntry);
}
@@ -516,7 +518,6 @@ public class RangeIndexCreatorTest {
Assert.fail();
}
-
private static Object valuesArray(DataType dataType, int numValues) {
switch (dataType) {
case INT:
@@ -539,7 +540,7 @@ public class RangeIndexCreatorTest {
int[] sorted = Arrays.copyOf(ints, ints.length);
Arrays.sort(sorted);
int[][] split = new int[ints.length / numValuesPerRange + 1][2];
- for (int i = 0; i < split.length - 1; ++i) {
+ for (int i = 0; i < split.length - 1; i++) {
split[i][0] = sorted[i * numValuesPerRange];
split[i][1] = sorted[(i + 1) * numValuesPerRange - 1];
}
@@ -552,7 +553,7 @@ public class RangeIndexCreatorTest {
long[] sorted = Arrays.copyOf(longs, longs.length);
Arrays.sort(sorted);
long[][] split = new long[longs.length / numValuesPerRange + 1][2];
- for (int i = 0; i < split.length - 1; ++i) {
+ for (int i = 0; i < split.length - 1; i++) {
split[i][0] = sorted[i * numValuesPerRange];
split[i][1] = sorted[(i + 1) * numValuesPerRange - 1];
}
@@ -565,7 +566,7 @@ public class RangeIndexCreatorTest {
float[] sorted = Arrays.copyOf(floats, floats.length);
Arrays.sort(sorted);
float[][] split = new float[floats.length / numValuesPerRange + 1][2];
- for (int i = 0; i < split.length - 1; ++i) {
+ for (int i = 0; i < split.length - 1; i++) {
split[i][0] = sorted[i * numValuesPerRange];
split[i][1] = sorted[(i + 1) * numValuesPerRange - 1];
}
@@ -578,7 +579,7 @@ public class RangeIndexCreatorTest {
double[] sorted = Arrays.copyOf(doubles, doubles.length);
Arrays.sort(sorted);
double[][] split = new double[doubles.length / numValuesPerRange +
1][2];
- for (int i = 0; i < split.length - 1; ++i) {
+ for (int i = 0; i < split.length - 1; i++) {
split[i][0] = sorted[i * numValuesPerRange];
split[i][1] = sorted[(i + 1) * numValuesPerRange - 1];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
