From 371a680c7f3b73fc39a99c3c5e63577bb445352c Mon Sep 17 00:00:00 2001
From: "Y." <y.lemaout@gmail.com>
Date: Wed, 12 Feb 2025 11:36:23 -0500
Subject: [PATCH] Minor cleanups (#585)

Misc cleanups I had stashed locally
---
 include/pgduckdb/logger.hpp | 2 +-
 src/pgduckdb_node.cpp       | 9 ++++-----
 src/pgduckdb_planner.cpp    | 3 +--
 src/utility/copy.cpp        | 1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/pgduckdb/logger.hpp b/include/pgduckdb/logger.hpp
index 67ae9ce8..1e510a78 100644
--- a/include/pgduckdb/logger.hpp
+++ b/include/pgduckdb/logger.hpp
@@ -46,7 +46,7 @@ namespace pgduckdb {
 		pd_prevent_errno_in_scope();                                                                                   \
 		static_assert(elevel >= DEBUG5 && elevel <= WARNING_CLIENT_ONLY, "Invalid error level");                       \
 		if (message_level_is_interesting(elevel)) {                                                                    \
-			std::lock_guard<std::mutex> lock(GlobalProcessLock::GetLock());                                            \
+			std::lock_guard<std::mutex> lock(pgduckdb::GlobalProcessLock::GetLock());                                  \
 			if (errstart(elevel, domain))                                                                              \
 				__VA_ARGS__, errfinish(__FILE__, __LINE__, __func__);                                                  \
 		}                                                                                                              \
diff --git a/src/pgduckdb_node.cpp b/src/pgduckdb_node.cpp
index 9c796ba6..3c0993ac 100644
--- a/src/pgduckdb_node.cpp
+++ b/src/pgduckdb_node.cpp
@@ -97,8 +97,6 @@ Duckdb_BeginCustomScan(CustomScanState *cscanstate, EState *estate, int eflags)
 static void
 ExecuteQuery(DuckdbScanState *state) {
 	auto &prepared = *state->prepared_statement;
-	auto &query_results = state->query_results;
-	auto &connection = state->duckdb_connection;
 	auto pg_params = state->params;
 	const auto num_params = pg_params ? pg_params->numParams : 0;
 	duckdb::case_insensitive_map_t<duckdb::BoundParameterData> named_values;
@@ -136,7 +134,7 @@ ExecuteQuery(DuckdbScanState *state) {
 		return pending->ThrowError();
 	}
 
-	duckdb::PendingExecutionResult execution_result;
+	duckdb::PendingExecutionResult execution_result = duckdb::PendingExecutionResult::RESULT_NOT_READY;
 	while (true) {
 		execution_result = pending->ExecuteTask();
 		if (duckdb::PendingQueryResult::IsResultReady(execution_result)) {
@@ -144,6 +142,7 @@ ExecuteQuery(DuckdbScanState *state) {
 		}
 
 		if (QueryCancelPending) {
+			auto &connection = state->duckdb_connection;
 			// Send an interrupt
 			connection->Interrupt();
 			auto &executor = duckdb::Executor::Get(*connection->context);
@@ -160,8 +159,8 @@ ExecuteQuery(DuckdbScanState *state) {
 		return pending->ThrowError();
 	}
 
-	query_results = pending->Execute();
-	state->column_count = query_results->ColumnCount();
+	state->query_results = pending->Execute();
+	state->column_count = state->query_results->ColumnCount();
 	state->is_executed = true;
 }
 
diff --git a/src/pgduckdb_planner.cpp b/src/pgduckdb_planner.cpp
index fb0018a1..7e3cad1f 100644
--- a/src/pgduckdb_planner.cpp
+++ b/src/pgduckdb_planner.cpp
@@ -47,8 +47,7 @@ DuckdbPrepare(const Query *query) {
 	elog(DEBUG2, "(PGDuckDB/DuckdbPrepare) Preparing: %s", query_string);
 
 	auto con = pgduckdb::DuckDBManager::GetConnection();
-	auto prepared_query = con->context->Prepare(query_string);
-	return prepared_query;
+	return con->context->Prepare(query_string);
 }
 
 static Plan *
diff --git a/src/utility/copy.cpp b/src/utility/copy.cpp
index c1b8ef7a..0341552c 100644
--- a/src/utility/copy.cpp
+++ b/src/utility/copy.cpp
@@ -21,7 +21,6 @@ extern "C" {
 
 #include "pgduckdb/vendor/pg_list.hpp"
 #include "pgduckdb/pgduckdb_ruleutils.h"
-#include "pgduckdb/vendor/pg_list.hpp"
 }
 
 static constexpr char s3_filename_prefix[] = "s3://";