diff --git a/cpp/include/cudf/join/join.hpp b/cpp/include/cudf/join/join.hpp index 333bd69b0912..a66697ef48fd 100644 --- a/cpp/include/cudf/join/join.hpp +++ b/cpp/include/cudf/join/join.hpp @@ -365,35 +365,6 @@ filter_join_indices(cudf::table_view const& left, rmm::cuda_stream_view stream = cudf::get_default_stream(), rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()); -/** - * @brief Filters join result indices based on a conditional predicate and join type. - * - * @deprecated Use the overload that accepts an optional output size instead. - * - * @param left The left table for predicate evaluation (conditional columns only). - * @param right The right table for predicate evaluation (conditional columns only). - * @param left_indices Device span of row indices in the left table from hash join. - * @param right_indices Device span of row indices in the right table from hash join. - * @param predicate An AST expression that returns a boolean for each pair of rows. - * @param join_kind The type of join operation. Must be INNER_JOIN, LEFT_JOIN, or FULL_JOIN. - * @param stream CUDA stream used for kernel launches and memory operations. - * @param mr Device memory resource used to allocate output indices. - * - * @return A pair of device vectors [filtered_left_indices, filtered_right_indices] - * corresponding to rows that satisfy the join semantics and predicate. - */ -[[deprecated("Use the overload that takes an optional output_size parameter.")]] -std::pair>, - std::unique_ptr>> -filter_join_indices(cudf::table_view const& left, - cudf::table_view const& right, - cudf::device_span left_indices, - cudf::device_span right_indices, - cudf::ast::expression const& predicate, - cudf::join_kind join_kind, - rmm::cuda_stream_view stream, - rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()); - /** * @brief Returns the exact output size of `filter_join_indices` without materializing * the filtered index vectors. diff --git a/cpp/include/cudf/join/key_remapping.hpp b/cpp/include/cudf/join/key_remapping.hpp index 35a4b5db0bd2..e2b949ab8a5f 100644 --- a/cpp/include/cudf/join/key_remapping.hpp +++ b/cpp/include/cudf/join/key_remapping.hpp @@ -58,14 +58,6 @@ constexpr size_type KEY_REMAP_NOT_FOUND = -1; */ constexpr size_type KEY_REMAP_RIGHT_NULL = -2; -/** - * @brief Deprecated alias for `KEY_REMAP_RIGHT_NULL`. - * - * @deprecated Use `KEY_REMAP_RIGHT_NULL` instead. - */ -[[deprecated("Use KEY_REMAP_RIGHT_NULL instead.")]] constexpr size_type KEY_REMAP_BUILD_NULL = - KEY_REMAP_RIGHT_NULL; - /** * @brief Remaps keys to unique integer IDs * @@ -132,24 +124,6 @@ class key_remapping { rmm::cuda_stream_view stream = cudf::get_default_stream(), rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()) const; - /** - * @brief Deprecated alias for `remap_right_keys()`. - * - * @deprecated Use `remap_right_keys()` instead. - * - * @param stream CUDA stream used for device memory operations and kernel launches - * @param mr Device memory resource used to allocate device memory for the returned column - * - * @return A column of INT32 values with the remapped key IDs - */ - [[deprecated("Use remap_right_keys instead.")]] [[nodiscard]] std::unique_ptr - remap_build_keys( - rmm::cuda_stream_view stream = cudf::get_default_stream(), - rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()) const - { - return remap_right_keys(stream, mr); - } - /** * @brief Remap left keys to integer IDs. * @@ -172,26 +146,6 @@ class key_remapping { rmm::cuda_stream_view stream = cudf::get_default_stream(), rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()) const; - /** - * @brief Deprecated alias for `remap_left_keys()`. - * - * @deprecated Use `remap_left_keys()` instead. - * - * @param keys The left keys to remap (must have same schema as the right table) - * @param stream CUDA stream used for device memory operations and kernel launches - * @param mr Device memory resource used to allocate device memory for the returned column - * - * @return A column of INT32 values with the remapped key IDs - */ - [[deprecated("Use remap_left_keys instead.")]] [[nodiscard]] std::unique_ptr - remap_probe_keys( - cudf::table_view const& keys, - rmm::cuda_stream_view stream = cudf::get_default_stream(), - rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref()) const - { - return remap_left_keys(keys, stream, mr); - } - /** * @brief Check if metrics (distinct_count, max_duplicate_count) were computed. * diff --git a/cpp/src/join/filter_join_indices/filter_join_indices.cu b/cpp/src/join/filter_join_indices/filter_join_indices.cu index bbc7b2e64d73..7d6938bc8e7f 100644 --- a/cpp/src/join/filter_join_indices/filter_join_indices.cu +++ b/cpp/src/join/filter_join_indices/filter_join_indices.cu @@ -480,22 +480,6 @@ filter_join_indices(cudf::table_view const& left, left, right, left_indices, right_indices, predicate, join_kind, output_size, stream, mr); } -std::pair>, - std::unique_ptr>> -filter_join_indices(cudf::table_view const& left, - cudf::table_view const& right, - cudf::device_span left_indices, - cudf::device_span right_indices, - ast::expression const& predicate, - cudf::join_kind join_kind, - rmm::cuda_stream_view stream, - rmm::device_async_resource_ref mr) -{ - CUDF_FUNC_RANGE(); - return detail::filter_join_indices( - left, right, left_indices, right_indices, predicate, join_kind, std::nullopt, stream, mr); -} - std::pair>> filter_join_indices_output_size(cudf::table_view const& left, cudf::table_view const& right,