Skip to content

Commit f71fb42

Browse files
committed
Fix initialization
1 parent bb14402 commit f71fb42

File tree

4 files changed

+56
-3
lines changed

4 files changed

+56
-3
lines changed

patch/0029-init.patch

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
From 55345f209f2394cf79236cad0e76bb81ce26a2ff Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
3+
Date: Tue, 9 Dec 2025 17:10:06 +0100
4+
Subject: [PATCH] init
5+
6+
---
7+
src/duckdb/src/main/connection.cpp | 2 +-
8+
src/duckdb/src/planner/binder/tableref/bind_table_function.cpp | 2 +-
9+
src/duckdb/src/storage/metadata/metadata_manager.cpp | 2 +-
10+
3 files changed, 3 insertions(+), 3 deletions(-)
11+
12+
diff --git a/src/duckdb/src/main/connection.cpp b/src/duckdb/src/main/connection.cpp
13+
index ccb2775bc..1e107650a 100644
14+
--- a/src/duckdb/src/main/connection.cpp
15+
+++ b/src/duckdb/src/main/connection.cpp
16+
@@ -19,7 +19,7 @@
17+
namespace duckdb {
18+
19+
Connection::Connection(DatabaseInstance &database)
20+
- : context(make_shared_ptr<ClientContext>(database.shared_from_this())) {
21+
+ : context(make_shared_ptr<ClientContext>(database.shared_from_this())), connection_id(-1) {
22+
auto &connection_manager = ConnectionManager::Get(database);
23+
connection_manager.AddConnection(*context);
24+
connection_manager.AssignConnectionId(*this);
25+
diff --git a/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp b/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp
26+
index f06e9e1ad..5d2a09cf2 100644
27+
--- a/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp
28+
+++ b/src/duckdb/src/planner/binder/tableref/bind_table_function.cpp
29+
@@ -202,7 +202,7 @@ unique_ptr<LogicalOperator> Binder::BindTableFunctionInternal(TableFunction &tab
30+
vector<string> return_names;
31+
auto constexpr ordinality_name = "ordinality";
32+
string ordinality_column_name = ordinality_name;
33+
- idx_t ordinality_column_id;
34+
+ idx_t ordinality_column_id = -1;
35+
if (table_function.bind || table_function.bind_replace || table_function.bind_operator) {
36+
TableFunctionBindInput bind_input(parameters, named_parameters, input_table_types, input_table_names,
37+
table_function.function_info.get(), this, table_function, ref);
38+
diff --git a/src/duckdb/src/storage/metadata/metadata_manager.cpp b/src/duckdb/src/storage/metadata/metadata_manager.cpp
39+
index 0c67bb9ca..ba4ec04ed 100644
40+
--- a/src/duckdb/src/storage/metadata/metadata_manager.cpp
41+
+++ b/src/duckdb/src/storage/metadata/metadata_manager.cpp
42+
@@ -12,7 +12,7 @@ namespace duckdb {
43+
MetadataBlock::MetadataBlock() : block_id(INVALID_BLOCK), dirty(false) {
44+
}
45+
46+
-MetadataBlock::MetadataBlock(MetadataBlock &&other) noexcept : dirty(false) {
47+
+MetadataBlock::MetadataBlock(MetadataBlock &&other) noexcept : block_id(INVALID_BLOCK), dirty(false) {
48+
std::swap(block, other.block);
49+
std::swap(block_id, other.block_id);
50+
std::swap(free_blocks, other.free_blocks);
51+
--
52+
2.50.1
53+

src/duckdb/src/main/connection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace duckdb {
2020

2121
Connection::Connection(DatabaseInstance &database)
22-
: context(make_shared_ptr<ClientContext>(database.shared_from_this())) {
22+
: context(make_shared_ptr<ClientContext>(database.shared_from_this())), connection_id(-1) {
2323
auto &connection_manager = ConnectionManager::Get(database);
2424
connection_manager.AddConnection(*context);
2525
connection_manager.AssignConnectionId(*this);

src/duckdb/src/planner/binder/tableref/bind_table_function.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ unique_ptr<LogicalOperator> Binder::BindTableFunctionInternal(TableFunction &tab
202202
vector<string> return_names;
203203
auto constexpr ordinality_name = "ordinality";
204204
string ordinality_column_name = ordinality_name;
205-
idx_t ordinality_column_id;
205+
idx_t ordinality_column_id = -1;
206206
if (table_function.bind || table_function.bind_replace || table_function.bind_operator) {
207207
TableFunctionBindInput bind_input(parameters, named_parameters, input_table_types, input_table_names,
208208
table_function.function_info.get(), this, table_function, ref);

src/duckdb/src/storage/metadata/metadata_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace duckdb {
1212
MetadataBlock::MetadataBlock() : block_id(INVALID_BLOCK), dirty(false) {
1313
}
1414

15-
MetadataBlock::MetadataBlock(MetadataBlock &&other) noexcept : dirty(false) {
15+
MetadataBlock::MetadataBlock(MetadataBlock &&other) noexcept : block_id(INVALID_BLOCK), dirty(false) {
1616
std::swap(block, other.block);
1717
std::swap(block_id, other.block_id);
1818
std::swap(free_blocks, other.free_blocks);

0 commit comments

Comments
 (0)