Skip to content

Commit a5d7831

Browse files
authored
Merge pull request #30904 from def-/pr-closed-7572
comments: Change wording on references to PR 7572
2 parents 6587ccb + 7cd7055 commit a5d7831

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

deny.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,14 @@ ignore = [
230230
"RUSTSEC-2021-0153",
231231
# proc-macro-error is unmaintained, possible alternative: proc-macro-error2
232232
"RUSTSEC-2024-0370",
233-
# lexical-core: Multiple soundness issues, depends on arrow upgrading
234-
"RUSTSEC-2023-0086",
235233
# Use standard library's IsTerminal trait instead of `atty` (unmaintained)
236234
"RUSTSEC-2024-0375",
237235
# `derivative` is unmaintained; consider using an alternative (unmaintained)
238236
"RUSTSEC-2024-0388",
239237
# `instant` is unmaintained, and the author recommends using the maintained [`web-time`] crate instead.
240238
"RUSTSEC-2024-0384",
239+
# columnar: `Read` on uninitialized buffer may cause UB (ColumnarReadExt::read_typed_vec())
240+
"RUSTSEC-2021-0087",
241241

242242
]
243243

src/sql/src/func.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
19101910
// concat uses nonstandard bool -> string casts
19111911
// to match historical baggage in PostgreSQL.
19121912
ScalarType::Bool => expr.call_unary(UnaryFunc::CastBoolToStringNonstandard(func::CastBoolToStringNonstandard)),
1913-
// TODO(materialize#7572): remove call to PadChar
1913+
// TODO(see <materialize#7572>): remove call to PadChar
19141914
ScalarType::Char { length } => expr.call_unary(UnaryFunc::PadChar(func::PadChar { length })),
19151915
_ => typeconv::to_string(ecx, expr)
19161916
});
@@ -1930,7 +1930,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
19301930
// concat uses nonstandard bool -> string casts
19311931
// to match historical baggage in PostgreSQL.
19321932
ScalarType::Bool => expr.call_unary(UnaryFunc::CastBoolToStringNonstandard(func::CastBoolToStringNonstandard)),
1933-
// TODO(materialize#7572): remove call to PadChar
1933+
// TODO(see <materialize#7572>): remove call to PadChar
19341934
ScalarType::Char { length } => expr.call_unary(UnaryFunc::PadChar(func::PadChar { length })),
19351935
_ => typeconv::to_string(ecx, expr)
19361936
});
@@ -2702,7 +2702,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
27022702
// https://www.postgresql.org/docs/current/functions-json.html
27032703
"to_jsonb" => Scalar {
27042704
params!(Any) => Operation::unary(|ecx, e| {
2705-
// TODO(materialize#7572): remove this
2705+
// TODO(see <materialize#7572>): remove this
27062706
let e = match ecx.scalar_type(&e) {
27072707
ScalarType::Char { length } => e.call_unary(UnaryFunc::PadChar(func::PadChar { length })),
27082708
_ => e,
@@ -3056,7 +3056,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
30563056
params!(Float32) => AggregateFunc::MaxFloat32 => Float32, 2119;
30573057
params!(Float64) => AggregateFunc::MaxFloat64 => Float64, 2120;
30583058
params!(String) => AggregateFunc::MaxString => String, 2129;
3059-
// TODO(materialize#7572): make this its own function
3059+
// TODO(see <materialize#7572>): make this its own function
30603060
params!(Char) => AggregateFunc::MaxString => Char, 2244;
30613061
params!(Date) => AggregateFunc::MaxDate => Date, 2122;
30623062
params!(Timestamp) => AggregateFunc::MaxTimestamp => Timestamp, 2126;
@@ -3077,7 +3077,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
30773077
params!(Float32) => AggregateFunc::MinFloat32 => Float32, 2135;
30783078
params!(Float64) => AggregateFunc::MinFloat64 => Float64, 2136;
30793079
params!(String) => AggregateFunc::MinString => String, 2145;
3080-
// TODO(materialize#7572): make this its own function
3080+
// TODO(see <materialize#7572>): make this its own function
30813081
params!(Char) => AggregateFunc::MinString => Char, 2245;
30823082
params!(Date) => AggregateFunc::MinDate => Date, 2138;
30833083
params!(Timestamp) => AggregateFunc::MinTimestamp => Timestamp, 2142;
@@ -3088,7 +3088,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
30883088
},
30893089
"jsonb_agg" => Aggregate {
30903090
params!(Any) => Operation::unary_ordered(|ecx, e, order_by| {
3091-
// TODO(materialize#7572): remove this
3091+
// TODO(see <materialize#7572>): remove this
30923092
let e = match ecx.scalar_type(&e) {
30933093
ScalarType::Char { length } => e.call_unary(UnaryFunc::PadChar(func::PadChar { length })),
30943094
_ => e,
@@ -3108,7 +3108,7 @@ pub static PG_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
31083108
},
31093109
"jsonb_object_agg" => Aggregate {
31103110
params!(Any, Any) => Operation::binary_ordered(|ecx, key, val, order_by| {
3111-
// TODO(materialize#7572): remove this
3111+
// TODO(see <materialize#7572>): remove this
31123112
let key = match ecx.scalar_type(&key) {
31133113
ScalarType::Char { length } => key.call_unary(UnaryFunc::PadChar(func::PadChar { length })),
31143114
_ => key,
@@ -3717,7 +3717,7 @@ pub static MZ_CATALOG_BUILTINS: LazyLock<BTreeMap<&'static str, Func>> = LazyLoc
37173717
"map_agg" => Aggregate {
37183718
params!(String, Any) => Operation::binary_ordered(|ecx, key, val, order_by| {
37193719
let (value_type, val) = match ecx.scalar_type(&val) {
3720-
// TODO(materialize#7572): remove this
3720+
// TODO(see <materialize#7572>): remove this
37213721
ScalarType::Char { length } => (ScalarType::Char { length }, val.call_unary(UnaryFunc::PadChar(func::PadChar { length }))),
37223722
typ => (typ, val),
37233723
};

0 commit comments

Comments
 (0)