Support DuckDB v1.4

Author: dpxcc

.github/workflows/MainDistributionPipeline.yml

@@ -1,6 +1,3 @@
-#
-# This workflow calls the main distribution pipeline from DuckDB to build, test and (optionally) release the extension
-#
 name: Main Extension Distribution Pipeline
 on:
   push:
@@ -12,17 +9,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  duckdb-next-build:
+  duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
-    if: false   # extension-template is currently not compatible with main
+    uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
     with:
-      duckdb_version: main
-      ci_tools_version: main
+      duckdb_version: v1.4.0
+      ci_tools_version: v1.4.0
       enable_rust: true
+      exclude_archs: windows_amd64;windows_amd64_mingw;wasm_mvp;wasm_eh;wasm_threads
       extension_name: mooncake
 
-  duckdb-stable-build:
+  duckdb-oldstable-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
     with:
@@ -36,7 +33,7 @@ jobs:
     name: Code Quality Check
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_code_quality.yml@main
     with:
-      duckdb_version: v1.3.2
+      duckdb_version: main
       ci_tools_version: main
       extension_name: mooncake
-      format_checks: format
+      format_checks: format;tidy

Makefile

@@ -1,10 +1,11 @@
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-# Configuration of extension
 EXT_NAME=mooncake
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
-# Include the Makefile from extension-ci-tools
+DUCKDB_MINOR_VERSION = $(if $(wildcard duckdb/src/include/duckdb/main/extension/extension_loader.hpp),4,3)
+export CXXFLAGS += -DDUCKDB_MINOR_VERSION=$(DUCKDB_MINOR_VERSION)
+
 include extension-ci-tools/makefiles/duckdb_extension.Makefile
 
 format-all:

duckdb

@@ -6,7 +6,11 @@ namespace duckdb {
 
 class MooncakeExtension : public Extension {
 public:
+#if DUCKDB_MINOR_VERSION == 3
 	void Load(DuckDB &db) override;
+#else
+	void Load(ExtensionLoader &loader) override;
+#endif
 
 	string Name() override;
 

extension-ci-tools

@@ -2,14 +2,24 @@
 
 #include "duckdb/main/connection.hpp"
 #include "duckdb/main/database.hpp"
+#if DUCKDB_MINOR_VERSION > 3
+#include "duckdb/main/extension_helper.hpp"
+#endif
 #include "mooncake_extension.hpp"
 #include "pgmooncake.hpp"
 #include "storage/mooncake_storage.hpp"
 
 namespace duckdb {
 
+#if DUCKDB_MINOR_VERSION == 3
 void MooncakeExtension::Load(DuckDB &db) {
 	auto &config = DBConfig::GetConfig(*db.instance);
+#else
+void MooncakeExtension::Load(ExtensionLoader &loader) {
+	auto &db = loader.GetDatabaseInstance();
+	ExtensionHelper::AutoLoadExtension(db, "parquet");
+	auto &config = DBConfig::GetConfig(db);
+#endif
 	config.storage_extensions["mooncake"] = make_uniq<MooncakeStorageExtension>();
 
 	string init_query = Pgmooncake::GetInitQuery();
@@ -33,6 +43,7 @@ string MooncakeExtension::Version() const {
 } // namespace duckdb
 
 extern "C" {
+#if DUCKDB_MINOR_VERSION == 3
 DUCKDB_EXTENSION_API void mooncake_init(duckdb::DatabaseInstance &db) {
 	duckdb::DuckDB db_wrapper(db);
 	db_wrapper.LoadExtension<duckdb::MooncakeExtension>();
@@ -41,4 +52,9 @@ DUCKDB_EXTENSION_API void mooncake_init(duckdb::DatabaseInstance &db) {
 DUCKDB_EXTENSION_API const char *mooncake_version() {
 	return duckdb::DuckDB::LibraryVersion();
 }
+#else
+DUCKDB_CPP_EXTENSION_ENTRY(mooncake, loader) {
+	duckdb::MooncakeExtension().Load(loader);
+}
+#endif
 }

src/include/mooncake_extension.hpp

@@ -1,6 +1,10 @@
 #include "duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp"
 #include "duckdb/common/multi_file/multi_file_reader.hpp"
+#if DUCKDB_MINOR_VERSION == 3
 #include "duckdb/main/extension_util.hpp"
+#else
+#include "duckdb/main/extension/extension_loader.hpp"
+#endif
 #include "duckdb/parser/tableref/table_function_ref.hpp"
 #include "parquet_reader.hpp"
 #include "storage/mooncake_table.hpp"
@@ -106,7 +110,11 @@ struct MooncakeMultiFileReader : public MultiFileReader {
 		return make_uniq<MooncakeMultiFileReader>(table_function.function_info->Cast<MooncakeFunctionInfo>().table);
 	}
 
+#if DUCKDB_MINOR_VERSION == 3
 	shared_ptr<MultiFileList> CreateFileList(ClientContext &, const vector<string> &, FileGlobOptions) override {
+#else
+	shared_ptr<MultiFileList> CreateFileList(ClientContext &, const vector<string> &, const FileGlobInput &) override {
+#endif
 		return make_shared_ptr<MooncakeMultiFileList>(table);
 	}
 
@@ -135,7 +143,12 @@ struct MooncakeMultiFileReader : public MultiFileReader {
 };
 
 static TableFunction &GetParquetScan(ClientContext &context) {
+#if DUCKDB_MINOR_VERSION == 3
 	return ExtensionUtil::GetTableFunction(*context.db, "parquet_scan").functions.GetFunctionReferenceByOffset(0);
+#else
+	ExtensionLoader loader(*context.db, "mooncake");
+	return loader.GetTableFunction("parquet_scan").functions.GetFunctionReferenceByOffset(0);
+#endif
 }
 
 static unique_ptr<GlobalTableFunctionState> MooncakeScanInitGlobal(ClientContext &context,

src/mooncake_extension.cpp

@@ -86,15 +86,22 @@ optional_ptr<CatalogEntry> MooncakeSchema::LookupEntry(CatalogTransaction transa
 		throw InternalException("Error decoding schema: %s", ArrowErrorMessage(&error));
 	}
 
+#if DUCKDB_MINOR_VERSION == 3
 	ArrowTableType arrow_table;
 	vector<string> names;
-	vector<LogicalType> return_types;
-	ArrowTableFunction::PopulateArrowTableType(transaction.db->config, arrow_table, schema, names, return_types);
+	vector<LogicalType> types;
+	ArrowTableFunction::PopulateArrowTableType(transaction.db->config, arrow_table, schema, names, types);
+#else
+	ArrowTableSchema arrow_table;
+	ArrowTableFunction::PopulateArrowTableSchema(transaction.db->config, arrow_table, schema.arrow_schema);
+	auto &names = arrow_table.GetNames();
+	auto &types = arrow_table.GetTypes();
+#endif
 
 	CreateTableInfo table_info;
 	table_info.table = table_name;
 	for (idx_t i = 0; i < names.size(); i++) {
-		table_info.columns.AddColumn(ColumnDefinition(names[i], return_types[i]));
+		table_info.columns.AddColumn(ColumnDefinition(names[i], types[i]));
 	}
 	tables[table_name] = make_uniq<MooncakeTable>(catalog, *this, table_info, lsn, moonlink);
 	return *tables[table_name];

src/storage/mooncake_scan.cpp

@@ -4,8 +4,13 @@
 
 namespace duckdb {
 
+#if DUCKDB_MINOR_VERSION == 3
 unique_ptr<Catalog> MooncakeAttach(StorageExtensionInfo *storage_info, ClientContext &context, AttachedDatabase &db,
                                    const string &name, AttachInfo &info, AccessMode access_mode) {
+#else
+unique_ptr<Catalog> MooncakeAttach(optional_ptr<StorageExtensionInfo> storage_info, ClientContext &context,
+                                   AttachedDatabase &db, const string &name, AttachInfo &info, AttachOptions &options) {
+#endif
 	string uri;
 	string database;
 	for (auto &entry : info.options) {
@@ -29,8 +34,13 @@ unique_ptr<Catalog> MooncakeAttach(StorageExtensionInfo *storage_info, ClientCon
 	return make_uniq<MooncakeCatalog>(db, std::move(uri), std::move(database));
 }
 
+#if DUCKDB_MINOR_VERSION == 3
 unique_ptr<TransactionManager> MooncakeCreateTransactionManager(StorageExtensionInfo *storage_info,
                                                                 AttachedDatabase &db, Catalog &catalog) {
+#else
+unique_ptr<TransactionManager> MooncakeCreateTransactionManager(optional_ptr<StorageExtensionInfo> storage_info,
+                                                                AttachedDatabase &db, Catalog &catalog) {
+#endif
 	return make_uniq<MooncakeTransactionManager>(db, catalog);
 }
 

src/storage/mooncake_schema.cpp

@@ -5,6 +5,9 @@
     "vcpkg-configuration": {
         "overlay-ports": [
             "./extension-ci-tools/vcpkg_ports"
+        ],
+        "overlay-triplets": [
+            "./extension-ci-tools/toolchains"
         ]
     }
 }