luoyuxia commented on code in PR #22249: URL: https://github.com/apache/flink/pull/22249#discussion_r1223819746
########## flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/enumerate/NonSplittingRegexEnumerator.java: ########## @@ -0,0 +1,102 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.connector.file.src.enumerate; + +import org.apache.flink.connector.file.src.FileSourceSplit; +import org.apache.flink.core.fs.FileStatus; +import org.apache.flink.core.fs.FileSystem; +import org.apache.flink.core.fs.Path; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Predicate; + +/** + * This {@code FileEnumerator} enumerates all files under the given paths recursively. Each file + * matched the given regex pattern becomes one split; this enumerator does not split files into + * smaller "block" units. + * + * <p>The default instantiation of this enumerator filters files with the common hidden file + * prefixes '.' and '_'. A custom file filter can be specified. + */ +public class NonSplittingRegexEnumerator extends NonSplittingRecursiveEnumerator { + + /** The custom filter predicate to filter out unwanted files. */ + private final Predicate<Path> fileFilter; + + private final RegexFileFilter regexFileFilter; Review Comment: Do we really need this in here? I think in here `fileFilter` is enough. We can always construnct the `fileFilter` using regex expression. ########## flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/FileSystemTableSource.java: ########## @@ -269,10 +271,35 @@ private SourceProvider createSourceProvider(BulkFormat<RowData, FileSourceSplit> tableOptions .getOptional(FileSystemConnectorOptions.SOURCE_MONITOR_INTERVAL) .ifPresent(fileSourceBuilder::monitorContinuously); + tableOptions + .getOptional(FileSystemConnectorOptions.SOURCE_REGEX_PATTERN) + .ifPresent( + s -> { + String regexPath = connectBasePathAndRegex(path.getPath(), s); + fileSourceBuilder.setFileEnumerator( + bulkFormat.isSplittable() + ? () -> new BlockSplittingRegexEnumerator(regexPath) + : () -> new NonSplittingRegexEnumerator(regexPath)); + }); return SourceProvider.of(fileSourceBuilder.build()); } + private String connectBasePathAndRegex(String basePath, String regex) { + StringBuilder result = new StringBuilder(); + result.append(basePath); + if (!basePath.endsWith(Path.SEPARATOR)) { + result.append(Path.SEPARATOR); + } + int startIndex = 0; + while (startIndex < regex.length() Review Comment: Still, I'm try to understand why need `connectBasePathAndRegex`. It turns out that what the option `source.regex-pattern` is for? From the source code, seems it'll look like if the table path is `/dir`, the `source.regex-pattern` is `t/*`, it will try to match `/dir/t/*`? TBH, I'm not sure it's reasonable or not for it look wired or unclear to me. Another choice is user need to specifc `/dir/t/*` in `source.regex-pattern`. I don't have a strong perference about these two choice, and don't know which is a better choice. Let's hear other's voice. ########## flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/enumerate/NonSplittingRegexEnumerator.java: ########## @@ -0,0 +1,102 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.connector.file.src.enumerate; + +import org.apache.flink.connector.file.src.FileSourceSplit; +import org.apache.flink.core.fs.FileStatus; +import org.apache.flink.core.fs.FileSystem; +import org.apache.flink.core.fs.Path; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Predicate; + +/** + * This {@code FileEnumerator} enumerates all files under the given paths recursively. Each file + * matched the given regex pattern becomes one split; this enumerator does not split files into + * smaller "block" units. + * + * <p>The default instantiation of this enumerator filters files with the common hidden file + * prefixes '.' and '_'. A custom file filter can be specified. + */ +public class NonSplittingRegexEnumerator extends NonSplittingRecursiveEnumerator { + + /** The custom filter predicate to filter out unwanted files. */ + private final Predicate<Path> fileFilter; + + private final RegexFileFilter regexFileFilter; Review Comment: Also, I'm now thing do we really need to introduce `NonSplittingRecursiveEnumerator`? Why don't reuse `NonSplittingRecursiveEnumerator`, but the `fileFilter` will compose the logic of `DefaultFileFilter` and `RegexFileFilter`. ########## flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/enumerate/NonSplittingRegexEnumerator.java: ########## @@ -0,0 +1,102 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.connector.file.src.enumerate; + +import org.apache.flink.connector.file.src.FileSourceSplit; +import org.apache.flink.core.fs.FileStatus; +import org.apache.flink.core.fs.FileSystem; +import org.apache.flink.core.fs.Path; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Predicate; + +/** + * This {@code FileEnumerator} enumerates all files under the given paths recursively. Each file + * matched the given regex pattern becomes one split; this enumerator does not split files into + * smaller "block" units. + * + * <p>The default instantiation of this enumerator filters files with the common hidden file + * prefixes '.' and '_'. A custom file filter can be specified. + */ +public class NonSplittingRegexEnumerator extends NonSplittingRecursiveEnumerator { + + /** The custom filter predicate to filter out unwanted files. */ + private final Predicate<Path> fileFilter; + + private final RegexFileFilter regexFileFilter; Review Comment: I mean construct the `fileFilter` in `FileSystemTableSource`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
