Merge pull request #53 from carlopi/yyjson_upstream

Remove yyjson library, now supported upstream, and bump to main
duckdb · May 17, 2024 · fe04716 · fe04716
2 parents 02171d5 + 092665c
commit fe04716
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 17,402 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@v0.10.1
+    uses: duckdb/duckdb/.github/workflows/_extension_distribution.yml@main
     with:
       extension_name: iceberg
       duckdb_version: main
@@ -23,7 +23,7 @@ jobs:
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@v0.10.1
+    uses: duckdb/duckdb/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
       extension_name: iceberg

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,8 +18,7 @@ set(EXTENSION_SOURCES
     src/common/iceberg.cpp
     src/iceberg_functions/iceberg_snapshots.cpp
     src/iceberg_functions/iceberg_scan.cpp
-    src/iceberg_functions/iceberg_metadata.cpp
-    src/yyjson/yyjson.cpp)
+    src/iceberg_functions/iceberg_metadata.cpp)
 
 add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
 

diff --git a/duckdb b/duckdb
diff --git a/src/include/iceberg_metadata.hpp b/src/include/iceberg_metadata.hpp
@@ -12,6 +12,8 @@
 #include "yyjson.hpp"
 #include "iceberg_types.hpp"
 
+using namespace duckdb_yyjson;
+
 namespace duckdb {
 
 struct IcebergColumnDefinition {

diff --git a/src/include/iceberg_utils.hpp b/src/include/iceberg_utils.hpp
@@ -12,6 +12,8 @@
 #include "iceberg_types.hpp"
 #include "yyjson.hpp"
 
+using namespace duckdb_yyjson;
+
 namespace duckdb {
 
 class IcebergUtils {