Skip to content

Normalize tnumber multiplication naming from mult to mul #188

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

Open
estebanzimanyi wants to merge 2 commits into
base: fix/bump-meos-pin
Choose a base branch
from
Open

Normalize tnumber multiplication naming from mult to mul #188

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
fa2de57
Pin MEOS with the wasm pg_config SIZEOF_LONG_LONG fix
estebanzimanyi May 29, 2026
e8501f7
Normalize tnumber multiplication naming from mult to mul
estebanzimanyi May 29, 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
10 changes: 5 additions & 5 deletions src/include/temporal/temporal_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ struct TemporalFunctions {
static void Sub_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
static void Sub_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
static void Sub_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
static void Mult_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
static void Mult_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
static void Mult_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
static void Mult_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
static void Mult_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
static void Mul_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
static void Mul_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
static void Mul_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
static void Mul_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
static void Mul_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
static void Div_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
static void Div_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
static void Div_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
Expand Down
24 changes: 12 additions & 12 deletions src/temporal/temporal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,12 +1341,12 @@ void TemporalTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("-", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Sub_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("-", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Sub_tnumber_tnumber));

duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mult_tint_int));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_float_tfloat));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tfloat_float));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mul_tint_int));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_float_tfloat));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tfloat_float));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tnumber_tnumber));

duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("/", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Div_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("/", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Div_tint_int));
Expand Down Expand Up @@ -1390,12 +1390,12 @@ void TemporalTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_sub", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Sub_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_sub", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Sub_tnumber_tnumber));

duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mult_tint_int));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_float_tfloat));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tfloat_float));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mul_tint_int));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_float_tfloat));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tfloat_float));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_tnumber_tnumber));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tnumber_tnumber));

duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_div", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Div_int_tint));
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_div", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Div_tint_int));
Expand Down
10 changes: 5 additions & 5 deletions src/temporal/temporal_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4756,19 +4756,19 @@ void TemporalFunctions::Sub_tnumber_tnumber(DataChunk &args, ExpressionState &st
TemporalBinaryTT(args, result, [](Temporal *a, Temporal *b) { return sub_tnumber_tnumber(a, b); });
}

void TemporalFunctions::Mult_int_tint(DataChunk &args, ExpressionState &state, Vector &result) {
void TemporalFunctions::Mul_int_tint(DataChunk &args, ExpressionState &state, Vector &result) {
TemporalBinaryV1<int32_t>(args, result, [](int32_t i, Temporal *t) { return mul_int_tint(i, t); });
}
void TemporalFunctions::Mult_tint_int(DataChunk &args, ExpressionState &state, Vector &result) {
void TemporalFunctions::Mul_tint_int(DataChunk &args, ExpressionState &state, Vector &result) {
TemporalBinaryV<int32_t>(args, result, [](Temporal *t, int32_t i) { return mul_tint_int(t, i); });
}
void TemporalFunctions::Mult_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result) {
void TemporalFunctions::Mul_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result) {
TemporalBinaryV1<double>(args, result, [](double d, Temporal *t) { return mul_float_tfloat(d, t); });
}
void TemporalFunctions::Mult_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result) {
void TemporalFunctions::Mul_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result) {
TemporalBinaryV<double>(args, result, [](Temporal *t, double d) { return mul_tfloat_float(t, d); });
}
void TemporalFunctions::Mult_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result) {
void TemporalFunctions::Mul_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result) {
TemporalBinaryTT(args, result, [](Temporal *a, Temporal *b) { return mul_tnumber_tnumber(a, b); });
}

Expand Down
4 changes: 2 additions & 2 deletions test/sql/parity/026_tnumber_mathfuncs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
# (tint / tfloat) on either side. The error surfaces as
# `+(tstzset, TIMESTAMP WITH TIME ZONE) -> tstzset` (DuckDB picks an
# unrelated overload). MEOS symbols: tnumber_add_tnumber,
# tnumber_sub_tnumber, tnumber_mult_tnumber, tnumber_div_tnumber, plus
# tnumber_sub_tnumber, tnumber_mul_tnumber, tnumber_div_tnumber, plus
# the value-tnumber and tnumber-value variants for each of the four
# operators.
#
# The full surface to cover:
# value op tnumber, tnumber op value, tnumber op tnumber
# for + (add), - (sub), * (mult), / (div)
# for + (add), - (sub), * (mul), / (div)
# x both (tint, tfloat) base types
# = 24 ScalarFunction registrations per operator, 96 total.
# Plus unary functions: abs, deg, rad, atan, derivative.
Expand Down
4 changes: 2 additions & 2 deletions test/sql/parity/026b_tnumber_mathfuncs_followups.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ SELECT tnumber_sub(tfloat '[10@2000-01-01]', 5.0);
[5@2000-01-01 00:00:00+01]

query I
SELECT tnumber_mult(2.0, tfloat '[3@2000-01-01]');
SELECT tnumber_mul(2.0, tfloat '[3@2000-01-01]');
----
[6@2000-01-01 00:00:00+01]

Expand All @@ -74,7 +74,7 @@ SELECT tnumber_add(tfloat '[3@2000-01-01]', 4.0) = (tfloat '[3@2000-01-01]' + 4.
true

query I
SELECT tnumber_mult(tint '[5@2000-01-01]', tint '[2@2000-01-01]')
SELECT tnumber_mul(tint '[5@2000-01-01]', tint '[2@2000-01-01]')
= (tint '[5@2000-01-01]' * tint '[2@2000-01-01]');
----
true
4 changes: 2 additions & 2 deletions vcpkg_ports/meos/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO estebanzimanyi/MobilityDB
REF a8178dc9d56d841d0eb5025a7e8717c8d25a1d0f
SHA512 030a144bb3247695702dd2de11f4c389ed28c6eb0186e6988a489e2b00e9801179ba8f27bcbcd81ae89e398a7277ed7f9ff7058dbf15f5db322ae4644365c560
REF 3db47f887c61f049a6a03db55c48bedf6d10eee4
SHA512 b73123bca036813c43937f90f0d0ce45af5cb9e39d6a597304199d21ae854212319a3a7b58ecd075eb5678d89d6d5990b9faf63dd29bd8c9a4e2ed83282b94c5
)

vcpkg_replace_string(
Expand Down
Loading