Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@01e6e98 (#502)
Browse files Browse the repository at this point in the history
More defensive programming in RowVersionManager::CleanupAppend (duckdb/duckdb#14317)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and krlmlr authored Oct 17, 2024
1 parent f613ab3 commit 502e30d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "2-dev176"
#define DUCKDB_PATCH_VERSION "2-dev180"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 1
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.1.2-dev176"
#define DUCKDB_VERSION "v1.1.2-dev180"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "6dc2e93758"
#define DUCKDB_SOURCE_ID "01e6e98e38"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
6 changes: 5 additions & 1 deletion src/duckdb/src/storage/table/row_version_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,15 @@ void RowVersionManager::CleanupAppend(transaction_t lowest_active_transaction, i
for (idx_t vector_idx = start_vector_idx; vector_idx <= end_vector_idx; vector_idx++) {
idx_t vcount =
vector_idx == end_vector_idx ? row_group_end - end_vector_idx * STANDARD_VECTOR_SIZE : STANDARD_VECTOR_SIZE;
auto &info = *vector_info[vector_idx];
if (vcount != STANDARD_VECTOR_SIZE) {
// not written fully - skip
continue;
}
if (!vector_info[vector_idx]) {
// already vacuumed - skip
continue;
}
auto &info = *vector_info[vector_idx];
// if we wrote the entire chunk info try to compress it
unique_ptr<ChunkInfo> new_info;
auto cleanup = info.Cleanup(lowest_active_transaction, new_info);
Expand Down

0 comments on commit 502e30d

Please sign in to comment.