Skip to content

Conversation

@carlopi
Copy link
Collaborator

@carlopi carlopi commented Jul 3, 2025

This is not super pretty, since I have not found a more proper way to feature detect HTTPFSClient than #ifdef's on EMSCRIPTEN being defined.
Weakest part of this PR are the changes in extension/httpfs/httpfs_client.cpp, open to suggestions.

EDIT: I did changed approach, and skip the file at the CMake level

After this PR httpfs is re-enabled for all platforms.

@carlopi carlopi force-pushed the wasm_httputil_on_main branch from af36634 to a2cc411 Compare July 3, 2025 09:19
@carlopi carlopi requested a review from Mytherin July 3, 2025 10:19
@carlopi
Copy link
Collaborator Author

carlopi commented Jul 3, 2025

This is ready to be merged on my side

SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/extension/httpfs/include
${LOAD_HTTPFS_TESTS}
LINKED_LIBS "../../third_party/mbedtls/libduckdb_mbedtls.a"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, yes, I have not found a clean way to clean this up.

It should picked up from CMake, but that requires some changes in duckdb/duckdb that are not there (and unsure if they can land today).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can fix this up, question is: it's a blocker?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what problems it causes but it seems hacky - maybe it's fine. I'll leave it up to you

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does smell badly, you are right, now triggered to find the actual fix.

@carlopi carlopi merged commit ab43cb5 into duckdb:main Jul 3, 2025
35 of 36 checks passed
@carlopi carlopi deleted the wasm_httputil_on_main branch July 3, 2025 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants