-
Notifications
You must be signed in to change notification settings - Fork 173
add vortex-geo crate and WKB extension type #7722
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
b8ba676
add vortex-geo crate and WKB extension type
a10y 9c5f8f5
export to DuckDB
a10y f78e029
fix lockfiles
a10y c08acf0
support duckdb -> vortex WKB
a10y d652899
fix lockfiles
a10y 77eb2b8
revert change
a10y 7964c3c
fix handling of scalars
a10y aedb153
fix comment
a10y 8352d6c
formatting
a10y 4fa444b
Merge branch 'develop' into aduffy/geo-v0
a10y 6461288
address comments
a10y 0d0cec8
fix(vortex-duckdb): import new_exporter to satisfy clippy::absolute-p…
a10y af7708a
Merge branch 'develop' into aduffy/geo-v0
a10y e426c00
move ext exporter block to separate crate
a10y 038fe55
Merge remote-tracking branch 'origin/develop' into aduffy/geo-v0
a10y bb4850c
chore: bump vortex-geo prost lockfile entry to 0.14.4
a10y acad7c7
fix(vortex-duckdb): use vortex::array re-exports + import sibling geo…
a10y File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| #include "duckdb_vx/logical_type.h" | ||
| #include "duckdb/common/types.hpp" | ||
| #include <cassert> | ||
| #include <string> | ||
|
|
||
| duckdb_logical_type duckdb_vx_logical_type_copy(duckdb_logical_type ty) { | ||
| D_ASSERT(ty); | ||
|
|
@@ -19,3 +20,11 @@ char *duckdb_vx_logical_type_stringify(duckdb_logical_type c_type) { | |
| memcpy(result, str.c_str(), str.size() + 1); | ||
| return result; | ||
| } | ||
|
|
||
| duckdb_logical_type duckdb_vx_create_geometry(const char *crs) { | ||
| D_ASSERT(crs); | ||
| auto geom = | ||
| (*crs == '\0') ? duckdb::LogicalType::GEOMETRY() : duckdb::LogicalType::GEOMETRY(std::string(crs)); | ||
| auto copy = duckdb::make_uniq<duckdb::LogicalType>(std::move(geom)); | ||
| return reinterpret_cast<duckdb_logical_type>(copy.release()); | ||
|
a10y marked this conversation as resolved.
|
||
| } | ||
|
Comment on lines
+24
to
+30
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These C++ changes are because DuckDB upstream doesn't expose the full geometry type stuff over the C API. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.