Skip to content

Register the split-span and inherited accessor names once, from the catalog #354

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 1 commit into from
Aug 29, 2026
Merged

Register the split-span and inherited accessor names once, from the catalog #354

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
35 changes: 0 additions & 35 deletions src/geo/tgeography.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,21 +1180,7 @@ void TGeographyTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
loader.RegisterFunction( merge_function);

auto tempSubtype_function = ScalarFunction(
"tempSubtype",
{TGeographyTypes::tgeography()},
LogicalType::VARCHAR,
Temporal_subtype
);
loader.RegisterFunction( tempSubtype_function);

auto interp_function = ScalarFunction(
"interp",
{TGeographyTypes::tgeography()},
LogicalType::VARCHAR,
Temporal_interp
);
loader.RegisterFunction( interp_function);

auto memSize_function = ScalarFunction(
"memSize",
Expand Down Expand Up @@ -1229,29 +1215,8 @@ void TGeographyTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
loader.RegisterFunction( tgeography_end_value_function);

auto startInstant_function = ScalarFunction(
"startInstant",
{TGeographyTypes::tgeography()},
TGeographyTypes::tgeography(),
Temporal_start_instant
);
loader.RegisterFunction( startInstant_function);

auto endInstant_function = ScalarFunction(
"endInstant",
{TGeographyTypes::tgeography()},
TGeographyTypes::tgeography(),
Temporal_end_instant
);
loader.RegisterFunction( endInstant_function);

auto instantN_function = ScalarFunction(
"instantN",
{TGeographyTypes::tgeography(), LogicalType::INTEGER},
TGeographyTypes::tgeography(),
Temporal_instant_n
);
loader.RegisterFunction( instantN_function);


auto tgeography_gettimestamptz_function = ScalarFunction(
Expand Down
16 changes: 0 additions & 16 deletions src/geo/tgeography_in_out.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,22 +248,6 @@ inline void TgeographyFromStringExec(DataChunk &args, ExpressionState &, Vector
}

void TGeographyTypes::RegisterScalarInOutFunctions(ExtensionLoader &loader){
auto TgeographyAsText = ScalarFunction(
"asText",
{TGeographyTypes::tgeography()},
LogicalType::VARCHAR,
Tspatial_as_text
);
loader.RegisterFunction( TgeographyAsText);

auto TgeographyAsEWKT = ScalarFunction(
"asEWKT",
{TGeographyTypes::tgeography()},
LogicalType::VARCHAR,
Tspatial_as_ewkt
);
loader.RegisterFunction( TgeographyAsEWKT);

const auto B = LogicalType::BLOB;
const auto V = LogicalType::VARCHAR;
const auto T = TGeographyTypes::tgeography();
Expand Down
35 changes: 0 additions & 35 deletions src/geo/tgeometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,21 +1181,7 @@ void TGeometryTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, merge_function);

auto tempSubtype_function = ScalarFunction(
"tempSubtype",
{TGeometryTypes::tgeometry()},
LogicalType::VARCHAR,
Temporal_subtype
);
duckdb::RegisterSerializedScalarFunction(loader, tempSubtype_function);

auto interp_function = ScalarFunction(
"interp",
{TGeometryTypes::tgeometry()},
LogicalType::VARCHAR,
Temporal_interp
);
duckdb::RegisterSerializedScalarFunction(loader, interp_function);

auto memSize_function = ScalarFunction(
"memSize",
Expand Down Expand Up @@ -1230,29 +1216,8 @@ void TGeometryTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, tgeometry_end_value_function);

auto startInstant_function = ScalarFunction(
"startInstant",
{TGeometryTypes::tgeometry()},
TGeometryTypes::tgeometry(),
Temporal_start_instant
);
duckdb::RegisterSerializedScalarFunction(loader, startInstant_function);

auto endInstant_function = ScalarFunction(
"endInstant",
{TGeometryTypes::tgeometry()},
TGeometryTypes::tgeometry(),
Temporal_end_instant
);
duckdb::RegisterSerializedScalarFunction(loader, endInstant_function);

auto instantN_function = ScalarFunction(
"instantN",
{TGeometryTypes::tgeometry(), LogicalType::INTEGER},
TGeometryTypes::tgeometry(),
Temporal_instant_n
);
duckdb::RegisterSerializedScalarFunction(loader, instantN_function);


auto tgeometry_gettimestamptz_function = ScalarFunction(
Expand Down
16 changes: 0 additions & 16 deletions src/geo/tgeometry_in_out.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,22 +251,6 @@ inline void TspatialFromStringExec(DataChunk &args, ExpressionState &, Vector &r
}

void TGeometryTypes::RegisterScalarInOutFunctions(ExtensionLoader &loader){
auto TgeometryAsText = ScalarFunction(
"asText",
{TGeometryTypes::tgeometry()},
LogicalType::VARCHAR,
Tspatial_as_text
);
duckdb::RegisterSerializedScalarFunction(loader, TgeometryAsText);

auto TgeometryAsEWKT = ScalarFunction(
"asEWKT",
{TGeometryTypes::tgeometry()},
LogicalType::VARCHAR,
Tspatial_as_ewkt
);
duckdb::RegisterSerializedScalarFunction(loader, TgeometryAsEWKT);

// ---- tgeometryFromBinary / FromEWKB (auto-detects format) ----
const auto B = LogicalType::BLOB;
const auto V = LogicalType::VARCHAR;
Expand Down
41 changes: 0 additions & 41 deletions src/pointcloud/tpcpatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,12 +1170,6 @@ void TPcpatchTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, tpcpatchseqarr_4params);

auto tpcpatch_to_timespan_function = ScalarFunction(
"timeSpan",
{TPcpatchTypes::tpcpatch()},
SpanTypes::tstzspan(),
Temporal_to_tstzspan);
duckdb::RegisterSerializedScalarFunction(loader, tpcpatch_to_timespan_function);

auto tpcpatch_to_tinstant_function = ScalarFunction(
"tpcpatchInst",
Expand All @@ -1202,21 +1196,7 @@ void TPcpatchTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, merge_function);

auto tempSubtype_function = ScalarFunction(
"tempSubtype",
{TPcpatchTypes::tpcpatch()},
LogicalType::VARCHAR,
Temporal_subtype
);
duckdb::RegisterSerializedScalarFunction(loader, tempSubtype_function);

auto interp_function = ScalarFunction(
"interp",
{TPcpatchTypes::tpcpatch()},
LogicalType::VARCHAR,
Temporal_interp
);
duckdb::RegisterSerializedScalarFunction(loader, interp_function);

auto memSize_function = ScalarFunction(
"memSize",
Expand Down Expand Up @@ -1255,29 +1235,8 @@ void TPcpatchTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, tpcpatch_numpoints_function);

auto startInstant_function = ScalarFunction(
"startInstant",
{TPcpatchTypes::tpcpatch()},
TPcpatchTypes::tpcpatch(),
Temporal_start_instant
);
duckdb::RegisterSerializedScalarFunction(loader, startInstant_function);

auto endInstant_function = ScalarFunction(
"endInstant",
{TPcpatchTypes::tpcpatch()},
TPcpatchTypes::tpcpatch(),
Temporal_end_instant
);
duckdb::RegisterSerializedScalarFunction(loader, endInstant_function);

auto instantN_function = ScalarFunction(
"instantN",
{TPcpatchTypes::tpcpatch(), LogicalType::INTEGER},
TPcpatchTypes::tpcpatch(),
Temporal_instant_n
);
duckdb::RegisterSerializedScalarFunction(loader, instantN_function);


auto tpcpatch_gettimestamptz_function = ScalarFunction(
Expand Down
41 changes: 0 additions & 41 deletions src/pointcloud/tpcpoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,12 +1132,6 @@ void TPcpointTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, tpcpointseqarr_4params);

auto tpcpoint_to_timespan_function = ScalarFunction(
"timeSpan",
{TPcpointTypes::tpcpoint()},
SpanTypes::tstzspan(),
Temporal_to_tstzspan);
duckdb::RegisterSerializedScalarFunction(loader, tpcpoint_to_timespan_function);

auto tpcpoint_to_tinstant_function = ScalarFunction(
"tpcpointInst",
Expand All @@ -1164,21 +1158,7 @@ void TPcpointTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, merge_function);

auto tempSubtype_function = ScalarFunction(
"tempSubtype",
{TPcpointTypes::tpcpoint()},
LogicalType::VARCHAR,
Temporal_subtype
);
duckdb::RegisterSerializedScalarFunction(loader, tempSubtype_function);

auto interp_function = ScalarFunction(
"interp",
{TPcpointTypes::tpcpoint()},
LogicalType::VARCHAR,
Temporal_interp
);
duckdb::RegisterSerializedScalarFunction(loader, interp_function);

auto memSize_function = ScalarFunction(
"memSize",
Expand Down Expand Up @@ -1209,29 +1189,8 @@ void TPcpointTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
);
duckdb::RegisterSerializedScalarFunction(loader, tpcpoint_pcid_function);

auto startInstant_function = ScalarFunction(
"startInstant",
{TPcpointTypes::tpcpoint()},
TPcpointTypes::tpcpoint(),
Temporal_start_instant
);
duckdb::RegisterSerializedScalarFunction(loader, startInstant_function);

auto endInstant_function = ScalarFunction(
"endInstant",
{TPcpointTypes::tpcpoint()},
TPcpointTypes::tpcpoint(),
Temporal_end_instant
);
duckdb::RegisterSerializedScalarFunction(loader, endInstant_function);

auto instantN_function = ScalarFunction(
"instantN",
{TPcpointTypes::tpcpoint(), LogicalType::INTEGER},
TPcpointTypes::tpcpoint(),
Temporal_instant_n
);
duckdb::RegisterSerializedScalarFunction(loader, instantN_function);


auto tpcpoint_gettimestamptz_function = ScalarFunction(
Expand Down
12 changes: 0 additions & 12 deletions src/temporal/set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,9 @@ void SetTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
ScalarFunction("set", {base_type}, set_type, SetFunctions::Value_to_set)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("intset", {SetTypes::floatset()}, SetTypes::intset(), SetFunctions::Floatset_to_intset)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("floatset", {SetTypes::intset()}, SetTypes::floatset(), SetFunctions::Intset_to_floatset)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("dateset", {SetTypes::tstzset()}, SetTypes::dateset(), SetFunctions::Tstzset_to_dateset)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("tstzset", {SetTypes::dateset()}, SetTypes::tstzset(), SetFunctions::Dateset_to_tstzset)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("memSize",{set_type}, LogicalType::INTEGER, SetFunctions::Set_mem_size)
Expand Down
75 changes: 0 additions & 75 deletions src/temporal/span.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,9 @@ void SpanTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
ScalarFunction("span", {base_type}, span_type, SpanFunctions::Value_to_span)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("intspan", {SpanTypes::floatspan()}, SpanTypes::intspan(), SpanFunctions::Floatspan_to_intspan)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("floatspan", {SpanTypes::intspan()}, SpanTypes::floatspan(), SpanFunctions::Intspan_to_floatspan)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("datespan", {SpanTypes::tstzspan()}, SpanTypes::datespan(), SpanFunctions::Tstzspan_to_datespan)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("tstzspan", {SpanTypes::datespan()}, SpanTypes::tstzspan(), SpanFunctions::Datespan_to_tstzspan)
);

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("span", {SetTypes::intset()},SpanTypes::intspan(), SpanFunctions::Set_to_span)
Expand Down Expand Up @@ -259,70 +247,7 @@ void SpanTypes::RegisterScalarFunctions(ExtensionLoader &loader) {

// spans(<set_type>) is generated from the catalog (set_spans) in generated_temporal_udfs.cpp.

duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNSpans", {SetTypes::intset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::intspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNSpans", {SetTypes::bigintset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::bigintspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNSpans", {SetTypes::floatset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::floatspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNSpans", {SetTypes::dateset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::datespan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNSpans", {SetTypes::tstzset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::tstzspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNSpans", {SetTypes::intset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::intspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNSpans", {SetTypes::bigintset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::bigintspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNSpans", {SetTypes::floatset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::floatspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNSpans", {SetTypes::dateset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::datespan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNSpans", {SetTypes::tstzset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::tstzspan()), SpanFunctions::Set_split_each_n_spans));

// Lowercase-"spans" aliases matching MobilityDB's SQL surface
// (`splitNspans` / `splitEachNspans`). The camelCase forms above
// stay registered for back-compat with existing MobilityDuck callers.
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNspans", {SetTypes::intset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::intspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNspans", {SetTypes::bigintset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::bigintspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNspans", {SetTypes::floatset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::floatspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNspans", {SetTypes::dateset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::datespan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitNspans", {SetTypes::tstzset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::tstzspan()), SpanFunctions::Set_split_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNspans", {SetTypes::intset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::intspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNspans", {SetTypes::bigintset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::bigintspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNspans", {SetTypes::floatset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::floatspan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNspans", {SetTypes::dateset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::datespan()), SpanFunctions::Set_split_each_n_spans));
duckdb::RegisterSerializedScalarFunction(loader,
ScalarFunction("splitEachNspans", {SetTypes::tstzset(), LogicalType::INTEGER},
LogicalType::LIST(SpanTypes::tstzspan()), SpanFunctions::Set_split_each_n_spans));

// floor/ceil/round/degrees/radians on floatspan are float-base scalar transforms
// generated from the catalog (generated_temporal_udfs.cpp), full arity plus the
Expand Down
Loading
Loading