Skip to content

Advance the MEOS commit and read the space splits and asMVTGeom through their out-parameters #422

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

Merged
estebanzimanyi merged 2 commits into from
Sep 30, 2026
Merged

Advance the MEOS commit and read the space splits and asMVTGeom through their out-parameters #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
035f45a
Advance the MEOS commit and regenerate the UDF surface
nhungoc1508 Sep 30, 2026
1cb495c
Read the space splits and asMVTGeom through their out-parameters
estebanzimanyi Sep 30, 2026
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: 4 additions & 0 deletions src/generated/generated_temporal_udfs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ void RegisterGenerated_meos_geo_restrict(ExtensionLoader &loader);
void RegisterGenerated_meos_geo_set_inout(ExtensionLoader &loader);
void RegisterGenerated_meos_geo_set_srid(ExtensionLoader &loader);
void RegisterGenerated_meos_geo_srid(ExtensionLoader &loader);
void RegisterGenerated_meos_geo_transf(ExtensionLoader &loader);
void RegisterGenerated_meos_h3_accessor(ExtensionLoader &loader);
void RegisterGenerated_meos_h3_base_accessor(ExtensionLoader &loader);
void RegisterGenerated_meos_h3_base_hierarchy(ExtensionLoader &loader);
Expand Down Expand Up @@ -156,6 +157,7 @@ void RegisterGenerated_meos_posechain_comp_ever(ExtensionLoader &loader);
void RegisterGenerated_meos_posechain_comp_temp(ExtensionLoader &loader);
void RegisterGenerated_meos_posechain_conversion(ExtensionLoader &loader);
void RegisterGenerated_meos_posechain_inout(ExtensionLoader &loader);
void RegisterGenerated_meos_posechain_transf(ExtensionLoader &loader);
void RegisterGenerated_meos_quadbin(ExtensionLoader &loader);
void RegisterGenerated_meos_quadbin_accessor(ExtensionLoader &loader);
void RegisterGenerated_meos_quadbin_base_comp(ExtensionLoader &loader);
Expand Down Expand Up @@ -256,6 +258,7 @@ void RegisterGeneratedTemporalUdfs(ExtensionLoader &loader) {
RegisterGenerated_meos_geo_set_inout(loader);
RegisterGenerated_meos_geo_set_srid(loader);
RegisterGenerated_meos_geo_srid(loader);
RegisterGenerated_meos_geo_transf(loader);
RegisterGenerated_meos_h3_accessor(loader);
RegisterGenerated_meos_h3_base_accessor(loader);
RegisterGenerated_meos_h3_base_hierarchy(loader);
Expand Down Expand Up @@ -327,6 +330,7 @@ void RegisterGeneratedTemporalUdfs(ExtensionLoader &loader) {
RegisterGenerated_meos_posechain_comp_temp(loader);
RegisterGenerated_meos_posechain_conversion(loader);
RegisterGenerated_meos_posechain_inout(loader);
RegisterGenerated_meos_posechain_transf(loader);
RegisterGenerated_meos_quadbin(loader);
RegisterGenerated_meos_quadbin_accessor(loader);
RegisterGenerated_meos_quadbin_base_comp(loader);
Expand Down
409 changes: 213 additions & 196 deletions src/generated/generated_temporal_udfs_0.cpp
View file
Open in desktop

Large diffs are not rendered by default.

405 changes: 215 additions & 190 deletions src/generated/generated_temporal_udfs_1.cpp
View file
Open in desktop

Large diffs are not rendered by default.

357 changes: 186 additions & 171 deletions src/generated/generated_temporal_udfs_2.cpp
View file
Open in desktop

Large diffs are not rendered by default.

509 changes: 256 additions & 253 deletions src/generated/generated_temporal_udfs_3.cpp
View file
Open in desktop

Large diffs are not rendered by default.

507 changes: 265 additions & 242 deletions src/generated/generated_temporal_udfs_4.cpp
View file
Open in desktop

Large diffs are not rendered by default.

378 changes: 217 additions & 161 deletions src/generated/generated_temporal_udfs_5.cpp
View file
Open in desktop

Large diffs are not rendered by default.

413 changes: 219 additions & 194 deletions src/generated/generated_temporal_udfs_6.cpp
View file
Open in desktop

Large diffs are not rendered by default.

327 changes: 175 additions & 152 deletions src/generated/generated_temporal_udfs_7.cpp
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 9 additions & 15 deletions src/geo/tgeompoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,12 +1519,12 @@ void TgeoAsMVTGeomExec(DataChunk &args, ExpressionState &state, Vector &result)
if (cc > 3) buffer = FlatVector::GetData<int32_t>(args.data[3])[row];
if (cc > 4) clip = FlatVector::GetData<bool>(args.data[4])[row];

MvtGeom mvt = tpoint_as_mvtgeom(t, bx, extent, buffer, clip);
GSERIALIZED *geom = nullptr;
int64 *times = nullptr;
int count = 0;
bool found = tpoint_as_mvtgeom(t, bx, extent, buffer, clip, &geom, &times, &count);
free(t); free(bx);
GSERIALIZED *geom = mvt.geom;
int64 *times = mvt.times;
int count = mvt.count;
if (!geom) {
if (!found || !geom) {
out_validity.SetInvalid(row);
times_entries[row] = list_entry_t{total_times, 0};
if (geom) free(geom);
Expand Down Expand Up @@ -1738,17 +1738,11 @@ void LoadSpaceSplitRow(ClientContext &context, SpaceSplitLocalState &state,
GSERIALIZED **bins = nullptr;
TimestampTz *tbins = nullptr;
if (with_time) {
SpaceTimeSplit sts = tgeo_space_time_split(temp, xsize, ysize, zsize, &mi, origin,
torigin, bitmatrix, true);
trajs = sts.fragments;
bins = sts.space_bins;
tbins = sts.time_bins;
count = sts.count;
trajs = tgeo_space_time_split(temp, xsize, ysize, zsize, &mi, origin, torigin,
bitmatrix, true, &bins, &tbins, &count);
} else {
SpaceSplit ss = tgeo_space_split(temp, xsize, ysize, zsize, origin, bitmatrix, true);
trajs = ss.fragments;
bins = ss.bins;
count = ss.count;
trajs = tgeo_space_split(temp, xsize, ysize, zsize, origin, bitmatrix, true, &bins,
&count);
}
free(temp);
free(origin);
Expand Down
2 changes: 1 addition & 1 deletion vcpkg_ports/meos/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# libmeos recompile per build) and makes two runs of the same commit build different
# sources. A recorded SHA keeps builds reproducible and the cache warm between
# advances.
set(_MEOS_REF "2495c4cc36825bc45eefae5ff1f2906a20bb43dc")
set(_MEOS_REF "60ed6ea3c8e784519f228efa27c0de405d6d3999")
message(STATUS "MEOS port: building MobilityDB at recorded ${_MEOS_REF}")

# FETCH_REF names the branch (always advertised) so the fetch works even when the
Expand Down
Loading