Skip to content

Commit 92b201b

Browse files
authored
[feat](param-refactor)Rename FS v2 to v1, remove legacy FS, and integrate new Storage/Azure features (#51539)
#50238 ### What problem does this PR solve? #### Rename FS v2 to v1 The current FS v2 implementation has been renamed to FS v1, making it the default and primary file system implementation. Remove Legacy FS All code and dependencies related to the legacy FS (the old v1 implementation) have been completely removed. #### Repository Cleanup Dropped all compatibility logic for the old FS. The Repository layer now exclusively uses the new FS and Storage interfaces. Deprecated configuration entries, injection code, and transitional hooks have been removed. #### New Storage and Azure Feature Integration Added support for new Azure file system features Improved integration between the Storage layer and Repository for better scalability.
1 parent 984f98f commit 92b201b

File tree

97 files changed

+618
-5437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+618
-5437
lines changed

fe/fe-core/src/main/java/org/apache/doris/analysis/LoadStmt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.doris.common.util.PrintableMap;
3131
import org.apache.doris.common.util.TimeUtils;
3232
import org.apache.doris.datasource.property.storage.ObjectStorageProperties;
33-
import org.apache.doris.fsv2.FileSystemFactory;
33+
import org.apache.doris.fs.FileSystemFactory;
3434
import org.apache.doris.load.EtlJobType;
3535
import org.apache.doris.load.loadv2.LoadTask;
3636
import org.apache.doris.mysql.privilege.PrivPredicate;

fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,16 @@
4444
import org.apache.doris.common.ErrorCode;
4545
import org.apache.doris.common.ErrorReport;
4646
import org.apache.doris.common.Pair;
47-
import org.apache.doris.common.UserException;
4847
import org.apache.doris.common.io.Writable;
4948
import org.apache.doris.common.util.DebugPointUtil;
5049
import org.apache.doris.common.util.MasterDaemon;
5150
import org.apache.doris.common.util.TimeUtils;
5251
import org.apache.doris.common.util.Util;
5352
import org.apache.doris.datasource.property.storage.StorageProperties;
54-
import org.apache.doris.fsv2.FileSystemFactory;
55-
import org.apache.doris.fsv2.remote.AzureFileSystem;
56-
import org.apache.doris.fsv2.remote.RemoteFileSystem;
57-
import org.apache.doris.fsv2.remote.S3FileSystem;
53+
import org.apache.doris.fs.FileSystemFactory;
54+
import org.apache.doris.fs.remote.AzureFileSystem;
55+
import org.apache.doris.fs.remote.RemoteFileSystem;
56+
import org.apache.doris.fs.remote.S3FileSystem;
5857
import org.apache.doris.nereids.trees.plans.commands.CancelBackupCommand;
5958
import org.apache.doris.nereids.trees.plans.commands.CreateRepositoryCommand;
6059
import org.apache.doris.persist.BarrierLog;
@@ -218,17 +217,10 @@ public void createRepository(CreateRepositoryCommand command) throws DdlExceptio
218217
}
219218

220219
RemoteFileSystem fileSystem;
221-
try {
222-
fileSystem = FileSystemFactory.get(command.getStorageType(), command.getProperties());
223-
} catch (UserException e) {
224-
throw new DdlException("Failed to initialize remote file system: " + e.getMessage());
225-
}
226-
org.apache.doris.fs.remote.RemoteFileSystem oldfs = org.apache.doris.fs.FileSystemFactory
227-
.get(command.getBrokerName(), command.getStorageType(),
228-
command.getProperties());
220+
fileSystem = FileSystemFactory.get(command.getStorageType(), command.getBrokerName(), command.getProperties());
229221
long repoId = env.getNextId();
230222
Repository repo = new Repository(repoId, command.getName(), command.isReadOnly(), command.getLocation(),
231-
fileSystem, oldfs);
223+
fileSystem);
232224

233225
Status st = repoMgr.addAndInitRepoIfNotExist(repo, false);
234226
if (!st.ok()) {
@@ -250,17 +242,10 @@ public void createRepository(CreateRepositoryStmt stmt) throws DdlException {
250242
}
251243

252244
RemoteFileSystem fileSystem;
253-
try {
254-
fileSystem = FileSystemFactory.get(stmt.getStorageType(), stmt.getProperties());
255-
} catch (UserException e) {
256-
throw new DdlException("Failed to initialize remote file system: " + e.getMessage());
257-
}
258-
org.apache.doris.fs.remote.RemoteFileSystem oldfs = org.apache.doris.fs.FileSystemFactory
259-
.get(stmt.getBrokerName(), stmt.getStorageType(),
260-
stmt.getProperties());
245+
fileSystem = FileSystemFactory.get(stmt.getStorageType(), stmt.getBrokerName(), stmt.getProperties());
261246
long repoId = env.getNextId();
262247
Repository repo = new Repository(repoId, stmt.getName(), stmt.isReadOnly(), stmt.getLocation(),
263-
fileSystem, oldfs);
248+
fileSystem);
264249

265250
Status st = repoMgr.addAndInitRepoIfNotExist(repo, false);
266251
if (!st.ok()) {
@@ -295,18 +280,10 @@ public void alterRepository(String repoName, Map<String, String> newProps, boole
295280
Map<String, String> mergedProps = mergeProperties(oldRepo, newProps, strictCheck);
296281
// Create new remote file system with merged properties
297282
RemoteFileSystem fileSystem = FileSystemFactory.get(StorageProperties.createPrimary(mergedProps));
298-
org.apache.doris.fs.remote.RemoteFileSystem oldfs = null;
299-
if (oldRepo.getRemoteFileSystem() instanceof S3FileSystem) {
300-
oldfs = org.apache.doris.fs.FileSystemFactory.get(oldRepo.getRemoteFileSystem().getName(),
301-
StorageBackend.StorageType.S3, mergedProps);
302-
} else if (oldRepo.getRemoteFileSystem() instanceof AzureFileSystem) {
303-
oldfs = org.apache.doris.fs.FileSystemFactory.get(oldRepo.getRemoteFileSystem().getName(),
304-
StorageBackend.StorageType.AZURE, mergedProps);
305-
}
306283
// Create new Repository instance with updated file system
307284
Repository newRepo = new Repository(
308285
oldRepo.getId(), oldRepo.getName(), oldRepo.isReadOnly(),
309-
oldRepo.getLocation(), fileSystem, oldfs
286+
oldRepo.getLocation(), fileSystem
310287
);
311288
// Verify the repository can be connected with new settings
312289
if (!newRepo.ping()) {

fe/fe-core/src/main/java/org/apache/doris/backup/Repository.java

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.apache.doris.common.util.TimeUtils;
3333
import org.apache.doris.datasource.property.constants.S3Properties;
3434
import org.apache.doris.datasource.property.storage.StorageProperties;
35-
import org.apache.doris.fsv2.FileSystemFactory;
36-
import org.apache.doris.fsv2.PersistentFileSystem;
37-
import org.apache.doris.fsv2.remote.BrokerFileSystem;
38-
import org.apache.doris.fsv2.remote.RemoteFile;
39-
import org.apache.doris.fsv2.remote.RemoteFileSystem;
40-
import org.apache.doris.fsv2.remote.S3FileSystem;
35+
import org.apache.doris.fs.FileSystemFactory;
36+
import org.apache.doris.fs.PersistentFileSystem;
37+
import org.apache.doris.fs.remote.BrokerFileSystem;
38+
import org.apache.doris.fs.remote.RemoteFile;
39+
import org.apache.doris.fs.remote.RemoteFileSystem;
40+
import org.apache.doris.fs.remote.S3FileSystem;
4141
import org.apache.doris.persist.gson.GsonPostProcessable;
4242
import org.apache.doris.persist.gson.GsonUtils;
4343
import org.apache.doris.system.Backend;
@@ -132,28 +132,22 @@ public class Repository implements Writable, GsonPostProcessable {
132132
private String location;
133133

134134
@SerializedName("fs")
135-
private org.apache.doris.fs.PersistentFileSystem oldfs;
136-
137-
// Temporary field: currently still using the legacy fs config (oldfs).
138-
// This field can be removed once the new fs configuration is fully enabled.
139135
private PersistentFileSystem fileSystem;
140136

141-
public org.apache.doris.fs.PersistentFileSystem getOldfs() {
142-
return oldfs;
137+
public PersistentFileSystem getFileSystem() {
138+
return fileSystem;
143139
}
144140

145141
private Repository() {
146142
// for persist
147143
}
148144

149-
public Repository(long id, String name, boolean isReadOnly, String location, RemoteFileSystem fileSystem,
150-
org.apache.doris.fs.PersistentFileSystem oldFs) {
145+
public Repository(long id, String name, boolean isReadOnly, String location, RemoteFileSystem fileSystem) {
151146
this.id = id;
152147
this.name = name;
153148
this.isReadOnly = isReadOnly;
154149
this.location = location;
155150
this.fileSystem = fileSystem;
156-
this.oldfs = oldFs;
157151
this.createTime = System.currentTimeMillis();
158152
}
159153

@@ -248,16 +242,8 @@ public Status alterRepositoryS3Properties(Map<String, String> properties) {
248242
@Override
249243
public void gsonPostProcess() {
250244
StorageBackend.StorageType type = StorageBackend.StorageType.BROKER;
251-
if (this.oldfs.properties.containsKey(org.apache.doris.fs.PersistentFileSystem.STORAGE_TYPE)) {
252-
type = StorageBackend.StorageType.valueOf(
253-
this.oldfs.properties.get(org.apache.doris.fs.PersistentFileSystem.STORAGE_TYPE));
254-
this.oldfs.properties.remove(org.apache.doris.fs.PersistentFileSystem.STORAGE_TYPE);
255-
}
256-
this.oldfs = org.apache.doris.fs.FileSystemFactory.get(this.oldfs.getName(),
257-
type,
258-
this.oldfs.getProperties());
259245
if (!type.equals(StorageBackend.StorageType.BROKER)) {
260-
StorageProperties storageProperties = StorageProperties.createPrimary(this.oldfs.properties);
246+
StorageProperties storageProperties = StorageProperties.createPrimary(this.fileSystem.properties);
261247
this.fileSystem = FileSystemFactory.get(storageProperties);
262248
}
263249
}
@@ -867,13 +853,7 @@ public void readFields(DataInput in) throws IOException {
867853
name = Text.readString(in);
868854
isReadOnly = in.readBoolean();
869855
location = Text.readString(in);
870-
oldfs = org.apache.doris.fs.PersistentFileSystem.read(in);
871-
try {
872-
fileSystem = FileSystemFactory.get(oldfs.getStorageType(), oldfs.getProperties());
873-
} catch (UserException e) {
874-
// do we ignore this exception?
875-
throw new IOException("Failed to create file system: " + e.getMessage());
876-
}
856+
fileSystem = PersistentFileSystem.read(in);
877857
createTime = in.readLong();
878858
}
879859
}

fe/fe-core/src/main/java/org/apache/doris/backup/RepositoryMgr.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.doris.common.io.Text;
2424
import org.apache.doris.common.io.Writable;
2525
import org.apache.doris.common.util.Daemon;
26-
import org.apache.doris.fsv2.remote.AzureFileSystem;
27-
import org.apache.doris.fsv2.remote.S3FileSystem;
26+
import org.apache.doris.fs.remote.AzureFileSystem;
27+
import org.apache.doris.fs.remote.S3FileSystem;
2828
import org.apache.doris.persist.gson.GsonPostProcessable;
2929
import org.apache.doris.persist.gson.GsonUtils;
3030

fe/fe-core/src/main/java/org/apache/doris/catalog/AzureResource.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import org.apache.doris.common.proc.BaseProcResult;
2323
import org.apache.doris.common.util.PrintableMap;
2424
import org.apache.doris.datasource.property.constants.S3Properties;
25+
import org.apache.doris.datasource.property.storage.AzureProperties;
26+
import org.apache.doris.datasource.property.storage.StorageProperties;
2527
import org.apache.doris.fs.obj.AzureObjStorage;
2628
import org.apache.doris.fs.obj.ObjStorage;
2729
import org.apache.doris.fs.obj.RemoteObjects;
@@ -90,7 +92,8 @@ protected static void pingAzure(String bucketName, String rootPath,
9092

9193
byte[] contentData = new byte[2 * ObjStorage.CHUNK_SIZE];
9294
Arrays.fill(contentData, (byte) 'A');
93-
AzureObjStorage azureObjStorage = new AzureObjStorage(newProperties);
95+
AzureProperties azureProperties = (AzureProperties) StorageProperties.createPrimary(newProperties);
96+
AzureObjStorage azureObjStorage = new AzureObjStorage(azureProperties);
9497

9598
Status status = azureObjStorage.putObject(testObj, new ByteArrayInputStream(contentData), contentData.length);
9699
if (!Status.OK.equals(status)) {

fe/fe-core/src/main/java/org/apache/doris/catalog/HdfsStorageVault.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.doris.common.security.authentication.AuthenticationConfig;
2424
import org.apache.doris.common.util.PrintableMap;
2525
import org.apache.doris.datasource.property.constants.S3Properties;
26+
import org.apache.doris.datasource.property.storage.HdfsCompatibleProperties;
27+
import org.apache.doris.datasource.property.storage.StorageProperties;
2628
import org.apache.doris.fs.remote.dfs.DFSFileSystem;
2729

2830
import com.google.common.base.Preconditions;
@@ -130,7 +132,8 @@ public static void checkConnectivity(Map<String, String> newProperties) throws D
130132
Preconditions.checkArgument(
131133
!Strings.isNullOrEmpty(pathPrefix), "%s is null or empty", PropertyKey.VAULT_PATH_PREFIX);
132134

133-
try (DFSFileSystem dfsFileSystem = new DFSFileSystem(newProperties)) {
135+
try (DFSFileSystem dfsFileSystem = new DFSFileSystem((HdfsCompatibleProperties) StorageProperties
136+
.createPrimary(newProperties))) {
134137
Long timestamp = System.currentTimeMillis();
135138
String remotePath = hadoopFsName + "/" + pathPrefix + "/doris-check-connectivity" + timestamp.toString();
136139

fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.doris.common.proc.BaseProcResult;
2424
import org.apache.doris.common.util.PrintableMap;
2525
import org.apache.doris.datasource.property.constants.S3Properties;
26+
import org.apache.doris.datasource.property.storage.AbstractS3CompatibleProperties;
27+
import org.apache.doris.datasource.property.storage.StorageProperties;
2628
import org.apache.doris.fs.obj.ObjStorage;
2729
import org.apache.doris.fs.obj.RemoteObjects;
2830
import org.apache.doris.fs.obj.S3ObjStorage;
@@ -126,7 +128,8 @@ protected static void pingS3(String bucketName, String rootPath, Map<String, Str
126128

127129
byte[] contentData = new byte[2 * ObjStorage.CHUNK_SIZE];
128130
Arrays.fill(contentData, (byte) 'A');
129-
S3ObjStorage s3ObjStorage = new S3ObjStorage(newProperties);
131+
S3ObjStorage s3ObjStorage = new S3ObjStorage((AbstractS3CompatibleProperties) StorageProperties
132+
.createPrimary(newProperties));
130133

131134
Status status = s3ObjStorage.putObject(testObj, new ByteArrayInputStream(contentData), contentData.length);
132135
if (!Status.OK.equals(status)) {

fe/fe-core/src/main/java/org/apache/doris/common/util/BrokerUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import org.apache.doris.common.Pair;
2929
import org.apache.doris.common.UserException;
3030
import org.apache.doris.datasource.hive.HiveMetaStoreCache;
31-
import org.apache.doris.fsv2.FileSystemFactory;
32-
import org.apache.doris.fsv2.remote.RemoteFile;
33-
import org.apache.doris.fsv2.remote.RemoteFileSystem;
31+
import org.apache.doris.fs.FileSystemFactory;
32+
import org.apache.doris.fs.remote.RemoteFile;
33+
import org.apache.doris.fs.remote.RemoteFileSystem;
3434
import org.apache.doris.service.FrontendOptions;
3535
import org.apache.doris.thrift.TBrokerCheckPathExistRequest;
3636
import org.apache.doris.thrift.TBrokerCheckPathExistResponse;

fe/fe-core/src/main/java/org/apache/doris/common/util/LocationPath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.doris.datasource.property.constants.ObsProperties;
2727
import org.apache.doris.datasource.property.constants.OssProperties;
2828
import org.apache.doris.datasource.property.constants.S3Properties;
29-
import org.apache.doris.fsv2.FileSystemType;
29+
import org.apache.doris.fs.FileSystemType;
3030
import org.apache.doris.thrift.TFileType;
3131

3232
import com.google.common.annotations.VisibleForTesting;

fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalMetaCacheMgr.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.doris.datasource.mvcc.MvccUtil;
3838
import org.apache.doris.datasource.paimon.PaimonMetadataCache;
3939
import org.apache.doris.datasource.paimon.PaimonMetadataCacheMgr;
40-
import org.apache.doris.fsv2.FileSystemCache;
40+
import org.apache.doris.fs.FileSystemCache;
4141
import org.apache.doris.nereids.exceptions.NotSupportedException;
4242

4343
import com.github.benmanes.caffeine.cache.CacheLoader;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/AcidUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.doris.common.util.LocationPath;
2222
import org.apache.doris.datasource.hive.AcidInfo.DeleteDeltaInfo;
2323
import org.apache.doris.datasource.hive.HiveMetaStoreCache.FileCacheValue;
24-
import org.apache.doris.fsv2.FileSystem;
25-
import org.apache.doris.fsv2.remote.RemoteFile;
24+
import org.apache.doris.fs.FileSystem;
25+
import org.apache.doris.fs.remote.RemoteFile;
2626

2727
import lombok.EqualsAndHashCode;
2828
import lombok.Getter;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import org.apache.doris.datasource.operations.ExternalMetadataOperations;
3838
import org.apache.doris.datasource.property.PropertyConverter;
3939
import org.apache.doris.datasource.property.constants.HMSProperties;
40-
import org.apache.doris.fsv2.FileSystemProvider;
41-
import org.apache.doris.fsv2.FileSystemProviderImpl;
42-
import org.apache.doris.fsv2.remote.dfs.DFSFileSystem;
40+
import org.apache.doris.fs.FileSystemProvider;
41+
import org.apache.doris.fs.FileSystemProviderImpl;
42+
import org.apache.doris.fs.remote.dfs.DFSFileSystem;
4343
import org.apache.doris.transaction.TransactionManagerFactory;
4444

4545
import com.google.common.annotations.VisibleForTesting;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.apache.doris.datasource.mvcc.MvccUtil;
5151
import org.apache.doris.datasource.systable.SupportedSysTables;
5252
import org.apache.doris.datasource.systable.SysTable;
53-
import org.apache.doris.fsv2.FileSystemDirectoryLister;
53+
import org.apache.doris.fs.FileSystemDirectoryLister;
5454
import org.apache.doris.mtmv.MTMVBaseTableIf;
5555
import org.apache.doris.mtmv.MTMVRefreshContext;
5656
import org.apache.doris.mtmv.MTMVRelatedTableIf;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSTransaction.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.apache.doris.common.info.SimpleTableInfo;
2828
import org.apache.doris.common.profile.SummaryProfile;
2929
import org.apache.doris.datasource.statistics.CommonStatistics;
30-
import org.apache.doris.fsv2.FileSystem;
31-
import org.apache.doris.fsv2.FileSystemProvider;
32-
import org.apache.doris.fsv2.FileSystemUtil;
33-
import org.apache.doris.fsv2.remote.RemoteFile;
34-
import org.apache.doris.fsv2.remote.S3FileSystem;
35-
import org.apache.doris.fsv2.remote.SwitchingFileSystem;
30+
import org.apache.doris.fs.FileSystem;
31+
import org.apache.doris.fs.FileSystemProvider;
32+
import org.apache.doris.fs.FileSystemUtil;
33+
import org.apache.doris.fs.remote.RemoteFile;
34+
import org.apache.doris.fs.remote.S3FileSystem;
35+
import org.apache.doris.fs.remote.SwitchingFileSystem;
3636
import org.apache.doris.nereids.trees.plans.commands.insert.HiveInsertCommandContext;
3737
import org.apache.doris.qe.ConnectContext;
3838
import org.apache.doris.thrift.TFileType;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
import org.apache.doris.datasource.ExternalCatalog;
4141
import org.apache.doris.datasource.ExternalMetaCacheMgr;
4242
import org.apache.doris.datasource.property.PropertyConverter;
43-
import org.apache.doris.fsv2.DirectoryLister;
44-
import org.apache.doris.fsv2.FileSystemCache;
45-
import org.apache.doris.fsv2.FileSystemDirectoryLister;
46-
import org.apache.doris.fsv2.FileSystemIOException;
47-
import org.apache.doris.fsv2.RemoteIterator;
48-
import org.apache.doris.fsv2.remote.RemoteFile;
49-
import org.apache.doris.fsv2.remote.RemoteFileSystem;
50-
import org.apache.doris.fsv2.remote.dfs.DFSFileSystem;
43+
import org.apache.doris.fs.DirectoryLister;
44+
import org.apache.doris.fs.FileSystemCache;
45+
import org.apache.doris.fs.FileSystemDirectoryLister;
46+
import org.apache.doris.fs.FileSystemIOException;
47+
import org.apache.doris.fs.RemoteIterator;
48+
import org.apache.doris.fs.remote.RemoteFile;
49+
import org.apache.doris.fs.remote.RemoteFileSystem;
50+
import org.apache.doris.fs.remote.dfs.DFSFileSystem;
5151
import org.apache.doris.metric.GaugeMetric;
5252
import org.apache.doris.metric.Metric;
5353
import org.apache.doris.metric.MetricLabel;

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.apache.doris.common.UserException;
2323
import org.apache.doris.datasource.ExternalCatalog;
2424
import org.apache.doris.datasource.statistics.CommonStatistics;
25-
import org.apache.doris.fsv2.remote.BrokerFileSystem;
26-
import org.apache.doris.fsv2.remote.RemoteFileSystem;
25+
import org.apache.doris.fs.remote.BrokerFileSystem;
26+
import org.apache.doris.fs.remote.RemoteFileSystem;
2727
import org.apache.doris.nereids.exceptions.AnalysisException;
2828
import org.apache.doris.qe.ConnectContext;
2929

fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.apache.doris.datasource.hive.HiveTransaction;
4444
import org.apache.doris.datasource.hive.source.HiveSplit.HiveSplitCreator;
4545
import org.apache.doris.datasource.mvcc.MvccUtil;
46-
import org.apache.doris.fsv2.DirectoryLister;
46+
import org.apache.doris.fs.DirectoryLister;
4747
import org.apache.doris.nereids.trees.plans.logical.LogicalFileScan.SelectedPartitions;
4848
import org.apache.doris.planner.PlanNodeId;
4949
import org.apache.doris.qe.ConnectContext;

fe/fe-core/src/main/java/org/apache/doris/datasource/hudi/source/HudiScanNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.doris.datasource.hudi.HudiSchemaCacheValue;
3737
import org.apache.doris.datasource.hudi.HudiUtils;
3838
import org.apache.doris.datasource.mvcc.MvccUtil;
39-
import org.apache.doris.fsv2.DirectoryLister;
39+
import org.apache.doris.fs.DirectoryLister;
4040
import org.apache.doris.planner.PlanNodeId;
4141
import org.apache.doris.qe.SessionVariable;
4242
import org.apache.doris.spi.Split;

0 commit comments

Comments
 (0)