Merge pull request #138 from samansmink/bump-duckdb-new-logger

new logger, bump duckdb to prerelease
duckdb · Jan 21, 2025 · f9367ef · f9367ef
2 parents 7f8cc36 + 9888c88
commit f9367ef
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
+      duckdb_version: v1.2-histrionicus
       ci_tools_version: main
       extension_name: delta
       enable_rust: true
@@ -30,6 +30,6 @@ jobs:
     secrets: inherit
     with:
       extension_name: delta
-      duckdb_version: main
+      duckdb_version: v1.2-histrionicus
       ci_tools_version: main
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw;linux_amd64_musl'
diff --git a/duckdb b/duckdb
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/src/delta_utils.cpp b/src/delta_utils.cpp
@@ -643,24 +643,25 @@ void LoggerCallback::Initialize(DatabaseInstance &db_p) {
 	}
 }
 
+static string ConvertLogMessage(ffi::Event event) {
+    auto log_type = KernelUtils::FromDeltaString(event.target);
+    auto message = KernelUtils::FromDeltaString(event.message);
+    auto file = KernelUtils::FromDeltaString(event.file);
+    string constructed_log_message;
+    if (!file.empty()) {
+        constructed_log_message = StringUtil::Format("[%s] %s@%u : %s ", log_type, file, event.line, message);
+    } else {
+        constructed_log_message = message;
+    }
+
+    return constructed_log_message;
+}
 void LoggerCallback::CallbackEvent(ffi::Event event) {
 	auto &instance = GetInstance();
 	auto db_locked = instance.db.lock();
 	if (db_locked) {
 		auto transformed_log_level = GetDuckDBLogLevel(event.level);
-		string constructed_log_message;
-		Logger::Log("delta.Kernel", *db_locked, transformed_log_level, [&]() {
-			auto log_type = KernelUtils::FromDeltaString(event.target);
-			auto message = KernelUtils::FromDeltaString(event.message);
-			auto file = KernelUtils::FromDeltaString(event.file);
-			if (!file.empty()) {
-				constructed_log_message = StringUtil::Format("[%s] %s@%u : %s ", log_type, file, event.line, message);
-			} else {
-				constructed_log_message = message;
-			}
-
-			return constructed_log_message.c_str();
-		});
+		DUCKDB_LOG( *db_locked, "delta.Kernel", transformed_log_level, ConvertLogMessage(event));
 	}
 }