Convert to C-API based extension

.clang-format

@@ -0,0 +1,33 @@
+---
+BasedOnStyle: LLVM
+SortIncludes: false
+TabWidth: 4
+IndentWidth: 4
+ColumnLimit: 120
+AllowShortFunctionsOnASingleLine: false
+---
+UseTab: ForIndentation
+DerivePointerAlignment: false
+PointerAlignment: Right
+AlignConsecutiveMacros: true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AlignAfterOpenBracket: Align
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: Yes
+IncludeBlocks: Regroup
+Language: Cpp
+AccessModifierOffset: -4
+---
+Language: Java
+SpaceAfterCStyleCast: true
+---

.clang-tidy

@@ -0,0 +1,55 @@
+Checks:          '-*,clang-diagnostic-*,bugprone-*,performance-*,google-explicit-constructor,google-build-using-namespace,google-runtime-int,misc-definitions-in-headers,modernize-use-nullptr,modernize-use-override,-bugprone-macro-parentheses,readability-braces-around-statements,-bugprone-branch-clone,readability-identifier-naming,hicpp-exception-baseclass,misc-throw-by-value-catch-by-reference,-bugprone-signed-char-misuse,-bugprone-misplaced-widening-cast,-bugprone-sizeof-expression,-bugprone-easily-swappable-parameters,google-global-names-in-headers,llvm-header-guard,misc-definitions-in-headers,modernize-use-emplace,modernize-use-bool-literals,-performance-inefficient-string-concatenation,-performance-no-int-to-ptr,readability-container-size-empty,cppcoreguidelines-pro-type-cstyle-cast,-llvm-header-guard,-performance-enum-size,cppcoreguidelines-pro-type-const-cast,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-slicing,cppcoreguidelines-rvalue-reference-param-not-moved,cppcoreguidelines-virtual-class-destructor,-readability-identifier-naming,-bugprone-exception-escape,-bugprone-unused-local-non-trivial-variable,-bugprone-empty-catch,-misc-use-internal-linkage,-readability-static-definition-in-anonymous-namespace'
+WarningsAsErrors: '*'
+HeaderFilterRegex: 'src/include/duckdb/.*'
+FormatStyle:     none
+CheckOptions:
+  - key:             readability-identifier-naming.ClassCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.EnumCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.TypedefCase
+    value:           lower_case
+  - key:             readability-identifier-naming.TypedefSuffix
+    value:           _t
+  - key:             readability-identifier-naming.FunctionCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.MemberCase
+    value:           lower_case
+  - key:             readability-identifier-naming.ParameterCase
+    value:           lower_case
+  - key:             readability-identifier-naming.ConstantCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.ConstantParameterCase
+    value:           lower_case
+  - key:             readability-identifier-naming.NamespaceCase
+    value:           lower_case
+  - key:             readability-identifier-naming.MacroDefinitionCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.StaticConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.ConstantMemberCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.StaticVariableCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.ClassConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.EnumConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.ConstexprVariableCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.StaticConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.TemplateTemplateParameterCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.TypeTemplateParameterCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.VariableCase
+    value:           lower_case
+  - key:             modernize-use-emplace.SmartPointers
+    value:           '::duckdb::shared_ptr;::duckdb::unique_ptr;::std::auto_ptr;::duckdb::weak_ptr'
+  - key:             cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams
+    value:           true
+  - key:             misc-use-internal-linkage
+    value:           true
+  - key:             readability-static-definition-in-anonymous-namespace
+    value:           true

.github/workflows/MainDistributionPipeline.yml

@@ -12,21 +12,23 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  duckdb-stable-build:
+  duckdb-build:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.4-andium
+      duckdb_version: main
       ci_tools_version: main
       extension_name: inet
+      extra_toolchains: python3
 
-  duckdb-stable-deploy:
-    name: Deploy extension binaries
-    needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
-    secrets: inherit
-    with:
-      duckdb_version: v1.4-andium
-      ci_tools_version: main
-      extension_name: inet
-      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
+# FIXME: This doesnt work with c-based extensions yet
+#  duckdb-deploy:
+#    name: Deploy extension binaries
+#    needs: duckdb-build
+#    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
+#    secrets: inherit
+#    with:
+#      duckdb_version: main
+#      ci_tools_version: main
+#      extension_name: inet
+#      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

.gitignore

@@ -1,2 +1,7 @@
-build/
-duckdb_unittest_tempdir/
+cmake_build
+build
+configure
+.idea
+duckdb_unittest_tempdir
+/test/bin
+venv

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "duckdb"]
-	path = duckdb
-	url = https://github.com/duckdb/duckdb.git
 [submodule "extension-ci-tools"]
 	path = extension-ci-tools
 	url = https://github.com/duckdb/extension-ci-tools.git

CMakeLists.txt

@@ -1,21 +1,58 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...3.29)
+option(DUCKDB_WASM_EXTENSION "Whether compiling for Wasm target" OFF)
 
-set(TARGET_NAME inet)
+set(EXTENSION_NAME inet)
+set(DUCKDB_EXTENSION_API_VERSION_UNSTABLE 1)
+###
+# Configuration
+###
+if(NOT DEFINED EXTENSION_NAME)
+    message(FATAL_ERROR "DuckDB extension name is required")
+endif()
+if (DEFINED TARGET_DUCKDB_VERSION_MAJOR)
+    add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MAJOR=${TARGET_DUCKDB_VERSION_MAJOR})
+endif()
+if (DEFINED TARGET_DUCKDB_VERSION_MINOR)
+    add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MINOR=${TARGET_DUCKDB_VERSION_MINOR})
+endif()
+if (DEFINED TARGET_DUCKDB_VERSION_PATCH)
+    add_definitions(-DDUCKDB_EXTENSION_API_VERSION_PATCH=${TARGET_DUCKDB_VERSION_PATCH})
+endif()
 
-set(EXTENSION_NAME ${TARGET_NAME}_extension)
-set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
+add_definitions(-DDUCKDB_EXTENSION_NAME=${EXTENSION_NAME})
 
-project(${TARGET_NAME})
-include_directories(src/include)
+if (DEFINED DUCKDB_EXTENSION_API_VERSION_UNSTABLE)
+    add_definitions(-DDUCKDB_EXTENSION_API_VERSION_UNSTABLE=${DUCKDB_EXTENSION_API_VERSION_UNSTABLE})
+endif()
 
-set(EXTENSION_SOURCES src/inet_extension.cpp src/inet_functions.cpp
-                      src/inet_escape_functions.cpp src/ipaddress.cpp)
+###
+# Build
+###
+project(${EXTENSION_NAME} LANGUAGES C)
 
-build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
-build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
+# Create Extension library
+set(EXTENSION_SOURCES
+        src/inet_extension.c
+        src/inet_html.c
+        src/inet_html_table.c
+        src/inet_ipaddress.c
+)
 
-install(
-  TARGETS ${EXTENSION_NAME}
-  EXPORT "${DUCKDB_EXPORT_SET}"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")
+if (DUCKDB_WASM_EXTENSION)
+    add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
+else()
+    add_library(${EXTENSION_NAME} SHARED ${EXTENSION_SOURCES})
+endif()
+
+# Hide symbols
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(VISIBILITY_INLINES_HIDDEN ON)
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+
+# Include own headers
+target_include_directories(${EXTENSION_NAME} PRIVATE src)
+
+# Include DuckDB C API headers
+target_include_directories(${EXTENSION_NAME} PRIVATE duckdb_capi)

Makefile

@@ -1,8 +1,32 @@
+.PHONY: clean clean_all
+
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-# Configuration of extension
-EXT_NAME=inet
-EXT_CONFIG=${PROJ_DIR}extension_config.cmake
+# Main extension configuration
+EXTENSION_NAME=inet
+
+# Set to 1 to enable Unstable API (binaries will only work on TARGET_DUCKDB_VERSION, forwards compatibility will be broken)
+# WARNING: When set to 1, the duckdb_extension.h from the TARGET_DUCKDB_VERSION must be used, using any other version of
+#          the header is unsafe.
+USE_UNSTABLE_C_API=1
+
+# The DuckDB version to target
+TARGET_DUCKDB_VERSION=d52dd4e3df
+
+all: configure release
+
+# Include makefiles from DuckDB
+include extension-ci-tools/makefiles/c_api_extensions/base.Makefile
+include extension-ci-tools/makefiles/c_api_extensions/c_cpp.Makefile
+
+configure: venv platform extension_version
+
+debug: build_extension_library_debug build_extension_with_metadata_debug
+release: build_extension_library_release build_extension_with_metadata_release
+
+test: test_debug
+test_debug: test_extension_debug
+test_release: test_extension_release
 
-# Include the Makefile from extension-ci-tools
-include extension-ci-tools/makefiles/duckdb_extension.Makefile
+clean: clean_build clean_cmake
+clean_all: clean clean_configure