Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove yyjson library, now supported upstream, and bump to main #53

Merged
merged 1 commit into from
May 17, 2024
Merged

Remove yyjson library, now supported upstream, and bump to main #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
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})

Expand Down
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 1328 files
2 changes: 2 additions & 0 deletions src/include/iceberg_metadata.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "yyjson.hpp"
#include "iceberg_types.hpp"

using namespace duckdb_yyjson;

namespace duckdb {

struct IcebergColumnDefinition {
Expand Down
2 changes: 2 additions & 0 deletions src/include/iceberg_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "iceberg_types.hpp"
#include "yyjson.hpp"

using namespace duckdb_yyjson;

namespace duckdb {

class IcebergUtils {
Expand Down
Loading
Loading