From 8abb99a3eadfc2c0331761e539421627e609ffa7 Mon Sep 17 00:00:00 2001 From: Bruce Ritchie Date: Sat, 9 Mar 2024 15:18:22 -0500 Subject: [PATCH] Merge updates. --- datafusion-cli/Cargo.lock | 4 ++-- datafusion/proto/src/logical_plan/from_proto.rs | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index 5e3c8648fc25..7d64a45eccbd 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -873,9 +873,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", diff --git a/datafusion/proto/src/logical_plan/from_proto.rs b/datafusion/proto/src/logical_plan/from_proto.rs index 828a081528b7..4f4b6b76a61a 100644 --- a/datafusion/proto/src/logical_plan/from_proto.rs +++ b/datafusion/proto/src/logical_plan/from_proto.rs @@ -48,13 +48,12 @@ use datafusion_expr::expr::Unnest; use datafusion_expr::window_frame::{check_window_frame, regularize_window_order_by}; use datafusion_expr::{ acosh, array, array_append, array_concat, array_distinct, array_element, - array_except, array_intersect, - array_pop_back, array_pop_front, array_position, array_positions, array_prepend, - array_remove, array_remove_all, array_remove_n, array_repeat, array_replace, - array_replace_all, array_replace_n, array_resize, array_slice, array_sort, - array_union, arrow_typeof, ascii, asinh, atan, atan2, atanh, bit_length, btrim, cbrt, - ceil, character_length, chr, coalesce, concat_expr, concat_ws_expr, cos, cosh, cot, - degrees, digest, ends_with, exp, + array_except, array_intersect, array_pop_back, array_pop_front, array_position, + array_positions, array_prepend, array_remove, array_remove_all, array_remove_n, + array_repeat, array_replace, array_replace_all, array_replace_n, array_resize, + array_slice, array_sort, array_union, arrow_typeof, ascii, asinh, atan, atan2, atanh, + bit_length, btrim, cbrt, ceil, character_length, chr, coalesce, concat_expr, + concat_ws_expr, cos, cosh, cot, degrees, digest, ends_with, exp, expr::{self, InList, Sort, WindowFunction}, factorial, find_in_set, flatten, floor, gcd, initcap, iszero, lcm, left, levenshtein, ln, log, log10, log2,