update

kuzudb · Aug 26, 2024 · e9fd8ba · e9fd8ba
1 parent 28080eb
commit e9fd8ba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/binder/bind/bind_import_database.cpp b/src/binder/bind/bind_import_database.cpp
@@ -24,7 +24,7 @@ static std::string getQueryFromFile(common::VirtualFileSystem* vfs, const std::s
     auto fileInfo = vfs->openFile(filePath, FileFlags::READ_ONLY
 // TODO(Ziyi): We need to handle O_BINARY here.
 #ifdef _WIN32
-                                                | _O_BINARY
+                                                | FileFlags::BINARY
 #endif
     );
     auto fsize = fileInfo->getFileSize();

diff --git a/src/common/file_system/local_file_system.cpp b/src/common/file_system/local_file_system.cpp
@@ -73,7 +73,6 @@ std::unique_ptr<FileInfo> LocalFileSystem::openFile(const std::string& path, int
     }
     if (writeMode) {
         KU_ASSERT(flags & FileFlags::WRITE);
-        openFlags |= O_CLOEXEC;
         if (flags & FileFlags::CREATE_IF_NOT_EXISTS) {
             openFlags |= O_CREAT;
         } else if (flags & FileFlags::CREATE_AND_TRUNCATE_IF_EXISTS) {
@@ -92,6 +91,9 @@ std::unique_ptr<FileInfo> LocalFileSystem::openFile(const std::string& path, int
     if (!(openFlags & O_WRONLY)) {
         dwDesiredAccess |= GENERIC_READ;
     }
+    if (openFlags & FileFlags::BINARY) {
+        dwDesiredAccess |= _O_BINARY;
+    }
 
     HANDLE handle = CreateFileA(fullPath.c_str(), dwDesiredAccess, dwShareMode, nullptr,
         dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, nullptr);

diff --git a/src/include/common/file_system/file_system.h b/src/include/common/file_system/file_system.h
@@ -26,6 +26,10 @@ struct FileFlags {
     static constexpr uint8_t CREATE_AND_TRUNCATE_IF_EXISTS = 1 << 4;
     // Temporary file that is not persisted to disk.
     static constexpr uint8_t TEMPORARY = 1 << 5;
+#ifdef _WIN32
+    // Only used in windows to open files in binary mode.
+    static constexpr uint8_t BINARY = 1 << 5;
+#endif
 };
 
 class KUZU_API FileSystem {

diff --git a/src/processor/operator/persistent/reader/csv/base_csv_reader.cpp b/src/processor/operator/persistent/reader/csv/base_csv_reader.cpp
@@ -23,7 +23,7 @@ BaseCSVReader::BaseCSVReader(const std::string& filePath, common::CSVOption opti
     fileInfo = context->getVFSUnsafe()->openFile(filePath,
         FileFlags::READ_ONLY
 #ifdef _WIN32
-            | _O_BINARY
+            | FileFlags::BINARY
 #endif
         ,
         context);