From 90ca889f84110a194de0b8efec9de04d42cf3f3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:06:36 +0800 Subject: [PATCH] branch-2.1: [fix](external)fix split and get the schema #45408 (#45566) Cherry-picked from #45408 Co-authored-by: wuwenchi --- .../org/apache/doris/common/util/LocationPath.java | 2 +- .../apache/doris/common/util/LocationPathTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/LocationPath.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/LocationPath.java index 4604e4deab..2318532cba 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/LocationPath.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/LocationPath.java @@ -90,7 +90,7 @@ public class LocationPath { private LocationPath(String originLocation, Map props, boolean convertPath) { isBindBroker = props.containsKey(HMSExternalCatalog.BIND_BROKER_NAME); String tmpLocation = originLocation; - if (!originLocation.contains(SCHEME_DELIM)) { + if (!(originLocation.contains(SCHEME_DELIM) || originLocation.contains(NONSTANDARD_SCHEME_DELIM))) { // Sometimes the file path does not contain scheme, need to add default fs // eg, /path/to/file.parquet -> hdfs://nn/path/to/file.parquet // the default fs is from the catalog properties diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/LocationPathTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/LocationPathTest.java index 9d1edadd91..4457b7dd1e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/util/LocationPathTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/LocationPathTest.java @@ -205,4 +205,16 @@ public class LocationPathTest { String beLocation = locationPath.toStorageLocation().toString(); Assertions.assertTrue(beLocation.equalsIgnoreCase("/path/to/local")); } + + @Test + public void testLocalFileSystem() { + HashMap props = new HashMap<>(); + props.put("fs.defaultFS", "hdfs:///xyz"); + LocationPath p1 = new LocationPath("file:///abc/def", props); + Assertions.assertEquals(Scheme.LOCAL, p1.getScheme()); + LocationPath p2 = new LocationPath("file:/abc/def", props); + Assertions.assertEquals(Scheme.LOCAL, p2.getScheme()); + LocationPath p3 = new LocationPath("file://authority/abc/def", props); + Assertions.assertEquals(Scheme.LOCAL, p3.getScheme()); + } }