vendor: Update vendored sources to duckdb/duckdb@cae7a68

Pull OpenFileExtended through the opener and virtual file system layers (duckdb/duckdb#17102)

Author: krlmlr

src/duckdb/src/common/virtual_file_system.cpp

@@ -9,27 +9,27 @@ VirtualFileSystem::VirtualFileSystem() : default_fs(FileSystem::CreateLocal()) {
 	VirtualFileSystem::RegisterSubSystem(FileCompressionType::GZIP, make_uniq<GZipFileSystem>());
 }
 
-unique_ptr<FileHandle> VirtualFileSystem::OpenFile(const string &path, FileOpenFlags flags,
-                                                   optional_ptr<FileOpener> opener) {
+unique_ptr<FileHandle> VirtualFileSystem::OpenFileExtended(const OpenFileInfo &file, FileOpenFlags flags,
+                                                           optional_ptr<FileOpener> opener) {
 	auto compression = flags.Compression();
 	if (compression == FileCompressionType::AUTO_DETECT) {
 		// auto-detect compression settings based on file name
-		auto lower_path = StringUtil::Lower(path);
+		auto lower_path = StringUtil::Lower(file.path);
 		if (StringUtil::EndsWith(lower_path, ".tmp")) {
 			// strip .tmp
 			lower_path = lower_path.substr(0, lower_path.length() - 4);
 		}
-		if (IsFileCompressed(path, FileCompressionType::GZIP)) {
+		if (IsFileCompressed(file.path, FileCompressionType::GZIP)) {
 			compression = FileCompressionType::GZIP;
-		} else if (IsFileCompressed(path, FileCompressionType::ZSTD)) {
+		} else if (IsFileCompressed(file.path, FileCompressionType::ZSTD)) {
 			compression = FileCompressionType::ZSTD;
 		} else {
 			compression = FileCompressionType::UNCOMPRESSED;
 		}
 	}
 	// open the base file handle in UNCOMPRESSED mode
 	flags.SetCompression(FileCompressionType::UNCOMPRESSED);
-	auto file_handle = FindFileSystem(path).OpenFile(path, flags, opener);
+	auto file_handle = FindFileSystem(file.path).OpenFile(file, flags, opener);
 	if (!file_handle) {
 		return nullptr;
 	}

src/duckdb/src/function/table/read_file.cpp

@@ -133,7 +133,7 @@ static void ReadFileExecute(ClientContext &context, TableFunctionInput &input, D
 
 		// Given the columns requested, do we even need to open the file?
 		if (state.requires_file_open) {
-			file_handle = fs.OpenFile(file.path, FileFlags::FILE_FLAGS_READ);
+			file_handle = fs.OpenFile(file, FileFlags::FILE_FLAGS_READ);
 		}
 
 		for (idx_t col_idx = 0; col_idx < state.column_ids.size(); col_idx++) {

src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,5 +1,5 @@
 #ifndef DUCKDB_PATCH_VERSION
-#define DUCKDB_PATCH_VERSION "0-dev2454"
+#define DUCKDB_PATCH_VERSION "0-dev2456"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 3
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 1
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v1.3.0-dev2454"
+#define DUCKDB_VERSION "v1.3.0-dev2456"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "93a9d9f9b5"
+#define DUCKDB_SOURCE_ID "cae7a680bc"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/common/opener_file_system.hpp

@@ -22,13 +22,6 @@ class OpenerFileSystem : public FileSystem {
 	void VerifyCanAccessDirectory(const string &path);
 	void VerifyCanAccessFile(const string &path);
 
-	unique_ptr<FileHandle> OpenFile(const string &path, FileOpenFlags flags,
-	                                optional_ptr<FileOpener> opener = nullptr) override {
-		VerifyNoOpener(opener);
-		VerifyCanAccessFile(path);
-		return GetFileSystem().OpenFile(path, flags, GetOpener());
-	}
-
 	void Read(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override {
 		GetFileSystem().Read(handle, buffer, nr_bytes, location);
 	};
@@ -152,6 +145,18 @@ class OpenerFileSystem : public FileSystem {
 		return GetFileSystem().ListSubSystems();
 	}
 
+protected:
+	unique_ptr<FileHandle> OpenFileExtended(const OpenFileInfo &file, FileOpenFlags flags,
+	                                        optional_ptr<FileOpener> opener = nullptr) override {
+		VerifyNoOpener(opener);
+		VerifyCanAccessFile(file.path);
+		return GetFileSystem().OpenFile(file, flags, GetOpener());
+	}
+
+	bool SupportsOpenFileExtended() const override {
+		return true;
+	}
+
 private:
 	void VerifyCanAccessFileInternal(const string &path, FileType type);
 };

src/duckdb/src/include/duckdb/common/virtual_file_system.hpp

@@ -19,9 +19,6 @@ class VirtualFileSystem : public FileSystem {
 public:
 	VirtualFileSystem();
 
-	unique_ptr<FileHandle> OpenFile(const string &path, FileOpenFlags flags,
-	                                optional_ptr<FileOpener> opener = nullptr) override;
-
 	void Read(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override;
 	void Write(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override;
 
@@ -71,6 +68,13 @@ class VirtualFileSystem : public FileSystem {
 
 	string PathSeparator(const string &path) override;
 
+protected:
+	unique_ptr<FileHandle> OpenFileExtended(const OpenFileInfo &file, FileOpenFlags flags,
+	                                        optional_ptr<FileOpener> opener) override;
+	bool SupportsOpenFileExtended() const override {
+		return true;
+	}
+
 private:
 	FileSystem &FindFileSystem(const string &path);
 	FileSystem &FindFileSystemInternal(const string &path);