Skip to content

Commit 6114b61

Browse files
committed
Fixup after merge, now DuckDB v1.2.0
1 parent 80d0b4e commit 6114b61

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
diff --git a/src/planner/binder/statement/bind_copy.cpp b/src/planner/binder/statement/bind_copy.cpp
2-
index 7db1db812d..60131d5916 100644
2+
index ce2f93ad86..140af5ba36 100644
33
--- a/src/planner/binder/statement/bind_copy.cpp
44
+++ b/src/planner/binder/statement/bind_copy.cpp
5-
@@ -137,7 +137,9 @@ BoundStatement Binder::BindCopyTo(CopyStatement &stmt) {
6-
throw NotImplementedException("Can't combine FILE_SIZE_BYTES and PARTITION_BY for COPY");
5+
@@ -152,7 +152,9 @@ BoundStatement Binder::BindCopyTo(CopyStatement &stmt, CopyToType copy_to_type)
6+
}
77
}
88
bool is_remote_file = FileSystem::IsRemoteFile(stmt.info->file_path);
99
- if (is_remote_file) {
1010
+ if ( is_remote_file ) {
1111
+ use_tmp_file = false;
12-
+ } else if( config.options.use_direct_io ) {
12+
+ } else if( context.db->config.options.use_direct_io ) {
1313
use_tmp_file = false;
1414
} else {
1515
auto &fs = FileSystem::GetFileSystem(context);

patches/duckdb/fix_load_database.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
diff --git a/src/storage/storage_manager.cpp b/src/storage/storage_manager.cpp
2-
index 456cd22614..c4777dd28e 100644
2+
index cb6c654e5f..a6b2af3b85 100644
33
--- a/src/storage/storage_manager.cpp
44
+++ b/src/storage/storage_manager.cpp
5-
@@ -163,9 +163,12 @@ void SingleFileStorageManager::LoadDatabase(const optional_idx block_alloc_size)
6-
options.use_direct_io = config.options.use_direct_io;
7-
options.debug_initialize = config.options.debug_initialize;
8-
5+
@@ -160,9 +160,12 @@ void SingleFileStorageManager::LoadDatabase(StorageOptions storage_options) {
6+
row_group_size, STANDARD_VECTOR_SIZE);
7+
}
8+
}
99
- // Check if the database file already exists.
1010
- // Note: a file can also exist if there was a ROLLBACK on a previous transaction creating that file.
1111
- if (!read_only && !fs.FileExists(path)) {

0 commit comments

Comments
 (0)