Skip to content

Commit e8501f7

Browse files
estebanzimanyiestebanzimanyi
committed
Normalize tnumber multiplication naming from mult to mul
Renames the SQL function tnumber_mult to tnumber_mul and the Mult_* execution methods to Mul_* (bodies already call mul_int_tint / mul_tfloat_float / mul_tnumber_tnumber). The * operator overloads are unchanged.
1 parent fa2de57 commit e8501f7

5 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎src/include/temporal/temporal_functions.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ struct TemporalFunctions {
209209
static void Sub_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
210210
static void Sub_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
211211
static void Sub_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
212-
static void Mult_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
213-
static void Mult_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
214-
static void Mult_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
215-
static void Mult_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
216-
static void Mult_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
212+
static void Mul_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
213+
static void Mul_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
214+
static void Mul_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);
215+
static void Mul_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result);
216+
static void Mul_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result);
217217
static void Div_int_tint(DataChunk &args, ExpressionState &state, Vector &result);
218218
static void Div_tint_int(DataChunk &args, ExpressionState &state, Vector &result);
219219
static void Div_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result);

‎src/temporal/temporal.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,12 +1341,12 @@ void TemporalTypes::RegisterScalarFunctions(ExtensionLoader &loader) {
13411341
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("-", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Sub_tnumber_tnumber));
13421342
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("-", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Sub_tnumber_tnumber));
13431343

1344-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_int_tint));
1345-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mult_tint_int));
1346-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_float_tfloat));
1347-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tfloat_float));
1348-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_tnumber_tnumber));
1349-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tnumber_tnumber));
1344+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_int_tint));
1345+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mul_tint_int));
1346+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_float_tfloat));
1347+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tfloat_float));
1348+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_tnumber_tnumber));
1349+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("*", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tnumber_tnumber));
13501350

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

1393-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_int_tint));
1394-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mult_tint_int));
1395-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_float_tfloat));
1396-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tfloat_float));
1397-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mult_tnumber_tnumber));
1398-
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mult", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mult_tnumber_tnumber));
1393+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_int_tint));
1394+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Mul_tint_int));
1395+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {LogicalType::DOUBLE, TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_float_tfloat));
1396+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TFLOAT(), LogicalType::DOUBLE}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tfloat_float));
1397+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TINT(), TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Mul_tnumber_tnumber));
1398+
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_mul", {TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()}, TemporalTypes::TFLOAT(), TemporalFunctions::Mul_tnumber_tnumber));
13991399

14001400
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_div", {LogicalType::INTEGER, TemporalTypes::TINT()}, TemporalTypes::TINT(), TemporalFunctions::Div_int_tint));
14011401
duckdb::RegisterSerializedScalarFunction(loader, ScalarFunction("tnumber_div", {TemporalTypes::TINT(), LogicalType::INTEGER}, TemporalTypes::TINT(), TemporalFunctions::Div_tint_int));

‎src/temporal/temporal_functions.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4756,19 +4756,19 @@ void TemporalFunctions::Sub_tnumber_tnumber(DataChunk &args, ExpressionState &st
47564756
TemporalBinaryTT(args, result, [](Temporal *a, Temporal *b) { return sub_tnumber_tnumber(a, b); });
47574757
}
47584758

4759-
void TemporalFunctions::Mult_int_tint(DataChunk &args, ExpressionState &state, Vector &result) {
4759+
void TemporalFunctions::Mul_int_tint(DataChunk &args, ExpressionState &state, Vector &result) {
47604760
TemporalBinaryV1<int32_t>(args, result, [](int32_t i, Temporal *t) { return mul_int_tint(i, t); });
47614761
}
4762-
void TemporalFunctions::Mult_tint_int(DataChunk &args, ExpressionState &state, Vector &result) {
4762+
void TemporalFunctions::Mul_tint_int(DataChunk &args, ExpressionState &state, Vector &result) {
47634763
TemporalBinaryV<int32_t>(args, result, [](Temporal *t, int32_t i) { return mul_tint_int(t, i); });
47644764
}
4765-
void TemporalFunctions::Mult_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result) {
4765+
void TemporalFunctions::Mul_float_tfloat(DataChunk &args, ExpressionState &state, Vector &result) {
47664766
TemporalBinaryV1<double>(args, result, [](double d, Temporal *t) { return mul_float_tfloat(d, t); });
47674767
}
4768-
void TemporalFunctions::Mult_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result) {
4768+
void TemporalFunctions::Mul_tfloat_float(DataChunk &args, ExpressionState &state, Vector &result) {
47694769
TemporalBinaryV<double>(args, result, [](Temporal *t, double d) { return mul_tfloat_float(t, d); });
47704770
}
4771-
void TemporalFunctions::Mult_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result) {
4771+
void TemporalFunctions::Mul_tnumber_tnumber(DataChunk &args, ExpressionState &state, Vector &result) {
47724772
TemporalBinaryTT(args, result, [](Temporal *a, Temporal *b) { return mul_tnumber_tnumber(a, b); });
47734773
}
47744774

‎test/sql/parity/026_tnumber_mathfuncs.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
# (tint / tfloat) on either side. The error surfaces as
88
# `+(tstzset, TIMESTAMP WITH TIME ZONE) -> tstzset` (DuckDB picks an
99
# unrelated overload). MEOS symbols: tnumber_add_tnumber,
10-
# tnumber_sub_tnumber, tnumber_mult_tnumber, tnumber_div_tnumber, plus
10+
# tnumber_sub_tnumber, tnumber_mul_tnumber, tnumber_div_tnumber, plus
1111
# the value-tnumber and tnumber-value variants for each of the four
1212
# operators.
1313
#
1414
# The full surface to cover:
1515
# value op tnumber, tnumber op value, tnumber op tnumber
16-
# for + (add), - (sub), * (mult), / (div)
16+
# for + (add), - (sub), * (mul), / (div)
1717
# x both (tint, tfloat) base types
1818
# = 24 ScalarFunction registrations per operator, 96 total.
1919
# Plus unary functions: abs, deg, rad, atan, derivative.

‎test/sql/parity/026b_tnumber_mathfuncs_followups.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SELECT tnumber_sub(tfloat '[10@2000-01-01]', 5.0);
5757
[5@2000-01-01 00:00:00+01]
5858

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

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

7676
query I
77-
SELECT tnumber_mult(tint '[5@2000-01-01]', tint '[2@2000-01-01]')
77+
SELECT tnumber_mul(tint '[5@2000-01-01]', tint '[2@2000-01-01]')
7878
= (tint '[5@2000-01-01]' * tint '[2@2000-01-01]');
7979
----
8080
true

0 commit comments

Comments
 (0)