[Fix](multi-catalog) Fix NPE when file cache is enabled.

apache · Aug 18, 2023 · 34fa70a · 34fa70a
1 parent 1c3cc77
commit 34fa70a
Showing 1 changed file with 3 additions and 4 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
@@ -326,6 +326,8 @@ public void createScanRangeLocations() throws UserException {
                 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 void createScanRangeLocations() throws UserException {
             } 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);
@@ -465,7 +464,7 @@ protected static Optional<TFileType> getTFileType(String location) {
             } else if (location.startsWith(FeConstants.FS_PREFIX_HDFS)) {
                 return Optional.of(TFileType.FILE_HDFS);
             } else if (location.startsWith(FeConstants.FS_PREFIX_COSN)) {
-                return Optional.of(TFileType.FILE_HDFS);
+                return Optional.of(TFileType.FILE_BROKER);
             } else if (location.startsWith(FeConstants.FS_PREFIX_FILE)) {
                 return Optional.of(TFileType.FILE_LOCAL);
             } else if (location.startsWith(FeConstants.FS_PREFIX_OFS)) {