Corrections after review.

vitlibar · vitlibar · commit 8e30ae172083 · 2025-10-31T21:38:35.000+01:00
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
@@ -285,14 +285,14 @@ std::pair<String, String> splitToArchivePathAndPathInArchive(const String & sour
     while (filename_view.starts_with(' '))
         filename_view.remove_prefix(1);
 
+    if (filename_view.empty() || path_to_archive_view.empty())
+        return {{}, source};
+
     /// possible situations when the first part can be archive is only if one of the following is true:
-    /// - it contains supported extension
+    /// - it contains supported archive extension
     /// - it contains characters that could mean glob expression
-    if (filename_view.empty() || path_to_archive_view.empty()
-        || (!hasSupportedArchiveExtension(path_to_archive_view) && path_to_archive_view.find_first_of("*?{") == std::string_view::npos))
-    {
+    if (!hasSupportedArchiveExtension(path_to_archive_view) && path_to_archive_view.find_first_of("*?{") == std::string_view::npos)
         return {{}, source};
-    }
 
     return {String{path_to_archive_view}, String{filename_view}};
 }
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
@@ -66,6 +66,7 @@ std::optional<String> TableFunctionFile::tryGetFormatFromFirstArgument()
     if (fd >= 0)
         return FormatFactory::instance().tryGetFormatFromFileDescriptor(fd);
 
+    chassert(file_source); /// TableFunctionFile::parseFirstArguments() initializes either `fd` or `file_source`.
     return file_source->format_from_filenames;
 }
 
@@ -95,6 +96,7 @@ StoragePtr TableFunctionFile::getStorage(
     if (fd >= 0)
         return std::make_shared<StorageFile>(fd, args);
 
+    chassert(file_source); /// TableFunctionFile::parseFirstArguments() initializes either `fd` or `file_source`.
     return std::make_shared<StorageFile>(*file_source, args);
 }
 
@@ -105,7 +107,7 @@ ColumnsDescription TableFunctionFile::getActualTableStructure(ContextPtr context
         if (fd >= 0)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Schema inference is not supported for table function '{}' with file descriptor", getName());
 
-        chassert(file_source);
+        chassert(file_source); /// TableFunctionFile::parseFirstArguments() initializes either `fd` or `file_source`.
 
         ColumnsDescription columns;
         if (format == "auto")
