From 11e18f4c98aca5630a5be783919d1c1e54a2d85e Mon Sep 17 00:00:00 2001 From: Xiangyu Wang Date: Mon, 3 Jul 2023 23:38:58 +0800 Subject: [PATCH] [Fix](multi-catalog) fix NPE for FileCacheValue. (#21441) FileCacheValue.files may be null if there is not any files exists for some partitions. --- .../doris/datasource/hive/HiveMetaStoreCache.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java index 0267668ed3..2859dd8549 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java @@ -917,9 +917,9 @@ public class HiveMetaStoreCache { @Data public static class FileCacheValue { // File Cache for self splitter. - private List files; + private final List files = Lists.newArrayList(); // File split cache for old splitter. This is a temp variable. - private List splits; + private final List splits = Lists.newArrayList(); private boolean isSplittable; // The values of partitions. // e.g for file : hdfs://path/to/table/part1=a/part2=b/datafile @@ -929,9 +929,6 @@ public class HiveMetaStoreCache { private AcidInfo acidInfo; public void addFile(RemoteFile file) { - if (files == null) { - files = Lists.newArrayList(); - } HiveFileStatus status = new HiveFileStatus(); status.setBlockLocations(file.getBlockLocations()); status.setPath(file.getPath()); @@ -942,9 +939,6 @@ public class HiveMetaStoreCache { } public void addSplit(Split split) { - if (splits == null) { - splits = Lists.newArrayList(); - } splits.add(split); }