Skip to content

Commit 27d589d

Browse files
committed
vendor: Update vendored sources to duckdb/duckdb@4e0a953
Bugfixes (duckdb/duckdb#17695) Fix version detection for sdist builds without git info (duckdb/duckdb#17605)
1 parent c37b5fd commit 27d589d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/duckdb/extension/parquet/include/writer/templated_column_writer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class StandardColumnWriter : public PrimitiveColumnWriter {
403403
break;
404404
}
405405
case duckdb_parquet::Encoding::BYTE_STREAM_SPLIT: {
406-
if (page_state.bss_initialized) {
406+
if (!page_state.bss_initialized) {
407407
page_state.bss_encoder.BeginWrite(BufferAllocator::Get(writer.GetContext()));
408408
page_state.bss_initialized = true;
409409
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "1-dev60"
2+
#define DUCKDB_PATCH_VERSION "1-dev65"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 3
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.3.1-dev60"
11+
#define DUCKDB_VERSION "v1.3.1-dev65"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "a2e752670d"
14+
#define DUCKDB_SOURCE_ID "4e0a953228"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/storage/caching_file_system.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,16 @@ BufferHandle CachingFileHandle::TryInsertFileRange(BufferHandle &pin, data_ptr_t
285285
auto &ranges = cached_file.Ranges(guard);
286286

287287
// Start at lower_bound (first range with location not less than location of newly created range)
288+
const auto this_end = location + nr_bytes;
288289
auto it = ranges.lower_bound(location);
289290
if (it != ranges.begin()) {
290291
--it;
291292
}
292293
while (it != ranges.end()) {
294+
if (it->second->location >= this_end) {
295+
// We're past the requested location
296+
break;
297+
}
293298
if (it->second->GetOverlap(*new_file_range) == CachedFileRangeOverlap::FULL) {
294299
// Another thread has read a range that fully contains the requested range in the meantime
295300
auto other_pin = TryReadFromFileRange(guard, *it->second, buffer, nr_bytes, location);
@@ -300,11 +305,9 @@ BufferHandle CachingFileHandle::TryInsertFileRange(BufferHandle &pin, data_ptr_t
300305
continue;
301306
}
302307
// Check if the new range overlaps with a cached one
303-
bool break_loop = false;
304308
switch (new_file_range->GetOverlap(*it->second)) {
305309
case CachedFileRangeOverlap::NONE:
306-
break_loop = true; // We iterated past potential overlaps
307-
break;
310+
break; // No overlap, still useful
308311
case CachedFileRangeOverlap::PARTIAL:
309312
break; // The newly created range does not fully contain this range, so it is still useful
310313
case CachedFileRangeOverlap::FULL:
@@ -315,9 +318,6 @@ BufferHandle CachingFileHandle::TryInsertFileRange(BufferHandle &pin, data_ptr_t
315318
default:
316319
throw InternalException("Unknown CachedFileRangeOverlap");
317320
}
318-
if (break_loop) {
319-
break;
320-
}
321321

322322
++it;
323323
}

0 commit comments

Comments
 (0)