From 4c01e9513c28ef590184d34c0c54292743562c8f Mon Sep 17 00:00:00 2001 From: David Wendt <45795991+davidwendt@users.noreply.github.com> Date: Wed, 3 Jan 2024 19:40:27 -0500 Subject: [PATCH] Fix call to deprecated factory function (#14695) A call to a deprecated `cudf::make_strings_column` factory function was introduced in #14664. This call had been previously fixed in #14461 but was lost when the source file was moved in #14664. Authors: - David Wendt (https://github.com/davidwendt) Approvers: - Bradley Dice (https://github.com/bdice) - Nghia Truong (https://github.com/ttnghia) URL: https://github.com/rapidsai/cudf/pull/14695 --- cpp/src/transform/row_conversion.cu | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cpp/src/transform/row_conversion.cu b/cpp/src/transform/row_conversion.cu index f3af90fb54f..a1c5827e5da 100644 --- a/cpp/src/transform/row_conversion.cu +++ b/cpp/src/transform/row_conversion.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, NVIDIA CORPORATION. + * Copyright (c) 2020-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -2506,12 +2506,15 @@ std::unique_ptr convert_from_rows(lists_column_view const& input, for (int i = 0; i < static_cast(schema.size()); ++i) { if (schema[i].id() == type_id::STRING) { // stuff real string column - auto string_data = string_row_offset_columns[string_idx].release()->release(); - output_columns[i] = make_strings_column(num_rows, - std::move(string_col_offsets[string_idx]), - std::move(string_data_cols[string_idx]), - std::move(*string_data.null_mask.release()), - 0); + auto string_data = string_row_offset_columns[string_idx].release()->release(); + output_columns[i] = + make_strings_column(num_rows, + std::make_unique( + std::move(string_col_offsets[string_idx]), rmm::device_buffer{}, 0), + std::make_unique( + std::move(string_data_cols[string_idx]), rmm::device_buffer{}, 0), + 0, + std::move(*string_data.null_mask.release())); // Null count set to 0, temporarily. Will be fixed up before return. string_idx++; }