Skip to content

Commit a524def

Browse files
authored
Pipe: Fixed the NPE of tree privilege check (#17006)
* null * add-test
1 parent dab572d commit a524def

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/pattern/IoTDBTreePatternTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,6 @@ public void testApplyReversedIndexes() {
143143
System.exit(-1);
144144
}
145145
}
146+
Assert.assertEquals(null, applyReversedIndexesOnList(filteredIndexes, null));
146147
}
147148
}

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/pattern/IoTDBTreePattern.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
import org.apache.tsfile.file.metadata.IDeviceID;
3333

34+
import javax.annotation.Nullable;
35+
3436
import java.util.ArrayList;
3537
import java.util.Arrays;
3638
import java.util.Collections;
@@ -67,7 +69,10 @@ private String getDefaultPattern() {
6769
//////////////////////////// Tree Pattern Operations ////////////////////////////
6870

6971
public static <T> List<T> applyReversedIndexesOnList(
70-
final List<Integer> filteredIndexes, final List<T> originalList) {
72+
final List<Integer> filteredIndexes, final @Nullable List<T> originalList) {
73+
if (Objects.isNull(originalList)) {
74+
return null;
75+
}
7176
// No need to sort, the caller guarantees that the filtered sequence == original sequence
7277
final List<T> filteredList = new ArrayList<>(originalList.size() - filteredIndexes.size());
7378
int filteredIndexPos = 0;

0 commit comments

Comments
 (0)