Merge pull request #387 from carlopi/duckdb_log

Bump to duckdb main and plug DuckDB own logging

Author: Mytherin

.github/workflows/Linux.yml

@@ -80,7 +80,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
+        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
 
     - name: Build extension
       env:
@@ -92,8 +92,9 @@ jobs:
     - name: Test extension
       env:
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
+        LOCAL_EXTENSION_REPO: 'build/reldebug/repository'
         PGSERVICE: postgres
       run: |
         psql -c "SELECT 43"
         source ./create-postgres-tables.sh
-        make test_reldebug
+        ./build/reldebug/test/unittest --autoloading available

.github/workflows/MainDistributionPipeline.yml

@@ -14,21 +14,21 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: 2323327f4
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: 2323327f4
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
       deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}

duckdb

@@ -17,7 +17,8 @@ add_library(
   postgres_scanner.cpp
   postgres_storage.cpp
   postgres_text_reader.cpp
-  postgres_utils.cpp)
+  postgres_utils.cpp
+  postgres_logging.cpp)
 set(ALL_OBJECT_FILES
     ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:postgres_ext_library>
     PARENT_SCOPE)

extension-ci-tools

@@ -19,7 +19,7 @@ struct PostgresBinaryReader : public PostgresResultReader {
 	~PostgresBinaryReader() override;
 
 public:
-	void BeginCopy(const string &sql) override;
+	void BeginCopy(ClientContext &context, const string &sql) override;
 	PostgresReadResult Read(DataChunk &result) override;
 
 protected:

src/CMakeLists.txt

@@ -45,14 +45,14 @@ class PostgresConnection {
 
 public:
 	static PostgresConnection Open(const string &dsn, const string &attach_path);
-	void Execute(const string &query);
-	unique_ptr<PostgresResult> TryQuery(const string &query, optional_ptr<string> error_message = nullptr);
-	unique_ptr<PostgresResult> Query(const string &query);
+	void Execute(optional_ptr<ClientContext> context, const string &query);
+	unique_ptr<PostgresResult> TryQuery(optional_ptr<ClientContext> context, const string &query, optional_ptr<string> error_message = nullptr);
+	unique_ptr<PostgresResult> Query(optional_ptr<ClientContext> context, const string &query);
 
 	//! Submits a set of queries to be executed in the connection.
-	vector<unique_ptr<PostgresResult>> ExecuteQueries(const string &queries);
+	vector<unique_ptr<PostgresResult>> ExecuteQueries(ClientContext &context, const string &queries);
 
-	PostgresVersion GetPostgresVersion();
+	PostgresVersion GetPostgresVersion(ClientContext &context);
 
 	vector<IndexInfo> GetIndexInfo(const string &table_name);
 
@@ -64,7 +64,7 @@ class PostgresConnection {
 	void CopyChunk(ClientContext &context, PostgresCopyState &state, DataChunk &chunk, DataChunk &varchar_chunk);
 	void FinishCopyTo(PostgresCopyState &state);
 
-	void BeginCopyFrom(const string &query, ExecStatusType expected_result);
+	void BeginCopyFrom(ClientContext &context, const string &query, ExecStatusType expected_result);
 
 	bool IsOpen();
 	void Close();
@@ -87,7 +87,7 @@ class PostgresConnection {
 	static bool DebugPrintQueries();
 
 private:
-	PGresult *PQExecute(const string &query);
+	PGresult *PQExecute(optional_ptr<ClientContext> context, const string &query);
 
 	shared_ptr<OwnedPostgresConnection> connection;
 	string dsn;

src/include/postgres_binary_reader.hpp

@@ -0,0 +1,20 @@
+
+#pragma once
+
+#include "duckdb/logging/logging.hpp"
+#include "duckdb/common/string_util.hpp"
+
+namespace duckdb {
+
+class PostgresQueryLogType : public LogType {
+public:
+	static constexpr const char *NAME = "PostgresQueryLog";
+	static constexpr LogLevel LEVEL = LogLevel::LOG_DEBUG;
+
+	PostgresQueryLogType() : LogType(NAME, LEVEL, GetLogType()) {};
+
+	static string ConstructLogMessage(const string &str, int64_t duration);
+	static LogicalType GetLogType();
+};
+
+} // namespace

src/include/postgres_connection.hpp

@@ -31,7 +31,7 @@ struct PostgresResultReader {
 	}
 
 public:
-	virtual void BeginCopy(const string &sql) = 0;
+	virtual void BeginCopy(ClientContext &context, const string &sql) = 0;
 	virtual PostgresReadResult Read(DataChunk &result) = 0;
 
 protected:

src/include/postgres_logging.hpp

@@ -20,7 +20,7 @@ struct PostgresTextReader : public PostgresResultReader {
 	~PostgresTextReader() override;
 
 public:
-	void BeginCopy(const string &sql) override;
+	void BeginCopy(ClientContext &context, const string &sql) override;
 	PostgresReadResult Read(DataChunk &result) override;
 
 private: