From 3d980ae24872b7cd1edc73fb81e08c008be3419d Mon Sep 17 00:00:00 2001 From: Qi Chen Date: Sun, 20 Aug 2023 23:35:28 +0800 Subject: [PATCH] [Fix](multi-catalog) Fix NPE when file cache is enabled. (#23165) --- .../org/apache/doris/planner/external/FileQueryScanNode.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileQueryScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileQueryScanNode.java index 4cf6ac829a..f5021c2608 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileQueryScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/external/FileQueryScanNode.java @@ -326,6 +326,8 @@ public abstract class FileQueryScanNode extends FileScanNode { HudiScanNode.setHudiParams(rangeDesc, (HudiSplit) fileSplit); } + curLocations.getScanRange().getExtScanRange().getFileScanRange().addToRanges(rangeDesc); + TScanRangeLocation location = new TScanRangeLocation(); Backend selectedBackend; if (enableSqlCache) { // Use consistent hash to assign the same scan range into the same backend among different queries @@ -336,9 +338,6 @@ public abstract class FileQueryScanNode extends FileScanNode { } else { selectedBackend = backendPolicy.getNextBe(); } - - curLocations.getScanRange().getExtScanRange().getFileScanRange().addToRanges(rangeDesc); - TScanRangeLocation location = new TScanRangeLocation(); location.setBackendId(selectedBackend.getId()); location.setServer(new TNetworkAddress(selectedBackend.getHost(), selectedBackend.getBePort())); curLocations.addToLocations(location);