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

Check for future geometry versions #388

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Check for future geometry versions #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91ff64d
check for future geometry versions, add test for future compatability
Maxxen Sep 6, 2024
505e3b4
add test
Maxxen Sep 6, 2024
a190f7c
add the db
Maxxen Sep 6, 2024
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
9 changes: 7 additions & 2 deletions spatial/include/spatial/core/geometry/geometry_processor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,13 @@ class GeometryProcessor {
public:
RESULT Process(const geometry_t &geom, ARGS... args) {

has_z = geom.GetProperties().HasZ();
has_m = geom.GetProperties().HasM();
const auto props = geom.GetProperties();

// Check the version
props.CheckVersion();

has_z = props.HasZ();
has_m = props.HasM();
nesting_level = 0;
current_type = geom.GetType();
parent_type = GeometryType::POINT;
Expand Down
14 changes: 14 additions & 0 deletions spatial/include/spatial/core/geometry/geometry_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ namespace spatial {

namespace core {

static constexpr const uint8_t GEOMETRY_VERSION = 0;

struct GeometryProperties {
private:
static constexpr const uint8_t Z = 0x01;
Expand All @@ -14,6 +16,8 @@ struct GeometryProperties {
// static constexpr const uint8_t EMPTY = 0x08;
// static constexpr const uint8_t GEODETIC = 0x10;
// static constexpr const uint8_t SOLID = 0x20;
static constexpr const uint8_t VERSION_1 = 0x40;
static constexpr const uint8_t VERSION_0 = 0x80;
uint8_t flags = 0;

public:
Expand All @@ -24,6 +28,16 @@ struct GeometryProperties {
SetM(has_m);
}

inline void CheckVersion() const {
const auto v0 = (flags & VERSION_0);
const auto v1 = (flags & VERSION_1);
if ((v1 | v0) != GEOMETRY_VERSION) {
throw NotImplementedException(
"This geometry seems to be written with a newer version of the DuckDB spatial library that is not "
"compatible with this version. Please upgrade your DuckDB installation.");
}
}

inline bool HasZ() const {
return (flags & Z) != 0;
}
Expand Down
13 changes: 9 additions & 4 deletions spatial/include/spatial/core/geometry/geometry_type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,15 @@ class geometry_t {
}

GeometryType GetType() const {
// return the type
return Load<GeometryType>(const_data_ptr_cast(data.GetPrefix()));
}

GeometryProperties GetProperties() const {
return Load<GeometryProperties>(const_data_ptr_cast(data.GetPrefix() + 1));
}
uint16_t GetHash() const {
return Load<uint16_t>(const_data_ptr_cast(data.GetPrefix() + 2));
const auto props = Load<GeometryProperties>(const_data_ptr_cast(data.GetPrefix() + 1));
// Check the version
props.CheckVersion();
return props;
}

bool TryGetCachedBounds(Box2D<double> &bbox) const {
Expand All @@ -101,6 +103,9 @@ class geometry_t {
auto hash = cursor.Read<uint16_t>();
(void)hash;

// Check the version
properties.CheckVersion();

if (properties.HasBBox()) {
cursor.Skip(4); // skip padding

Expand Down
Binary file added test/data/duckdb_v1_0_0.db
View file
Open in desktop
Binary file not shown.
27 changes: 27 additions & 0 deletions test/sql/geometry/geometry_version.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Query a database with geometry types created in duckdb v1.0.0
require spatial

statement ok
attach 'test/data/duckdb_v1_0_0.db' as db;

statement ok
use db

query IIII rowsort
SELECT st_geometrytype(geom), st_astext(geom), st_isvalid(geom), st_area(geom) FROM types;
----
GEOMETRYCOLLECTION GEOMETRYCOLLECTION (POINT (0 0), LINESTRING (0 0, 1 1)) true 0.0
GEOMETRYCOLLECTION GEOMETRYCOLLECTION EMPTY true 0.0
LINESTRING LINESTRING (0 0, 1 1) true 0.0
LINESTRING LINESTRING EMPTY true 0.0
MULTILINESTRING MULTILINESTRING ((0 0, 1 1), (2 2, 3 3)) true 0.0
MULTILINESTRING MULTILINESTRING EMPTY true 0.0
MULTIPOINT MULTIPOINT (0 0, 1 1) true 0.0
MULTIPOINT MULTIPOINT EMPTY true 0.0
MULTIPOLYGON MULTIPOLYGON (((0 0, 1 0, 1 1, 0 1, 0 0)), ((2 2, 3 2, 3 3, 2 3, 2 2))) true 2.0
MULTIPOLYGON MULTIPOLYGON EMPTY true 0.0
POINT POINT (0 0) true 0.0
POINT POINT EMPTY true 0.0
POLYGON POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)) true 1.0
POLYGON POLYGON EMPTY true 0.0

Loading