Skip to content

ARROW-13552: [C++] Remove deprecated APIs #10868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pitrou wants to merge 1 commit into from
Closed

ARROW-13552: [C++] Remove deprecated APIs #10868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cpp/src/arrow/array/array_nested.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,8 +730,6 @@ Result<std::shared_ptr<Array>> SparseUnionArray::Make(
return std::make_shared<SparseUnionArray>(std::move(internal_data));
}

std::shared_ptr<Array> UnionArray::child(int i) const { return field(i); }

std::shared_ptr<Array> UnionArray::field(int i) const {
if (i < 0 ||
static_cast<decltype(boxed_fields_)::size_type>(i) >= boxed_fields_.size()) {
Expand Down
6 changes: 0 additions & 6 deletions cpp/src/arrow/array/array_nested.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,6 @@ class ARROW_EXPORT UnionArray : public Array {

UnionMode::type mode() const { return union_type_->mode(); }

// Return the given field as an individual array.
// For sparse unions, the returned array has its offset, length and null
// count adjusted.
ARROW_DEPRECATED("Deprecated in 1.0.0. Use field(pos)")
std::shared_ptr<Array> child(int pos) const;

/// \brief Return the given field as an individual array.
///
/// For sparse unions, the returned array has its offset, length and null
Expand Down
5 changes: 0 additions & 5 deletions cpp/src/arrow/array/concatenate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,4 @@ Result<std::shared_ptr<Array>> Concatenate(const ArrayVector& arrays, MemoryPool
return MakeArray(std::move(out_data));
}

Status Concatenate(const ArrayVector& arrays, MemoryPool* pool,
std::shared_ptr<Array>* out) {
return Concatenate(arrays, pool).Value(out);
}

} // namespace arrow
5 changes: 0 additions & 5 deletions cpp/src/arrow/array/concatenate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,4 @@ ARROW_EXPORT
Result<std::shared_ptr<Array>> Concatenate(const ArrayVector& arrays,
MemoryPool* pool = default_memory_pool());

ARROW_DEPRECATED("Use Result-returning version")
ARROW_EXPORT
Status Concatenate(const ArrayVector& arrays, MemoryPool* pool,
std::shared_ptr<Array>* out);

} // namespace arrow
39 changes: 0 additions & 39 deletions cpp/src/arrow/compute/api_vector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,45 +236,6 @@ Result<std::shared_ptr<Array>> Take(const Array& values, const Array& indices,
// ----------------------------------------------------------------------
// Deprecated functions

Result<std::shared_ptr<ChunkedArray>> Take(const ChunkedArray& values,
const Array& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(values), Datum(indices), options, ctx));
return result.chunked_array();
}

Result<std::shared_ptr<ChunkedArray>> Take(const ChunkedArray& values,
const ChunkedArray& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(values), Datum(indices), options, ctx));
return result.chunked_array();
}

Result<std::shared_ptr<ChunkedArray>> Take(const Array& values,
const ChunkedArray& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(values), Datum(indices), options, ctx));
return result.chunked_array();
}

Result<std::shared_ptr<RecordBatch>> Take(const RecordBatch& batch, const Array& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(batch), Datum(indices), options, ctx));
return result.record_batch();
}

Result<std::shared_ptr<Table>> Take(const Table& table, const Array& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(table), Datum(indices), options, ctx));
return result.table();
}

Result<std::shared_ptr<Table>> Take(const Table& table, const ChunkedArray& indices,
const TakeOptions& options, ExecContext* ctx) {
ARROW_ASSIGN_OR_RAISE(Datum result, Take(Datum(table), Datum(indices), options, ctx));
return result.table();
}

Result<std::shared_ptr<Array>> SortToIndices(const Array& values, ExecContext* ctx) {
return SortIndices(values, SortOrder::Ascending, ctx);
}
Expand Down
36 changes: 0 additions & 36 deletions cpp/src/arrow/compute/api_vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,42 +366,6 @@ Result<Datum> DictionaryEncode(
// ----------------------------------------------------------------------
// Deprecated functions

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<ChunkedArray>> Take(
const ChunkedArray& values, const Array& indices,
const TakeOptions& options = TakeOptions::Defaults(), ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<ChunkedArray>> Take(
const ChunkedArray& values, const ChunkedArray& indices,
const TakeOptions& options = TakeOptions::Defaults(), ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<ChunkedArray>> Take(
const Array& values, const ChunkedArray& indices,
const TakeOptions& options = TakeOptions::Defaults(), ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<RecordBatch>> Take(
const RecordBatch& batch, const Array& indices,
const TakeOptions& options = TakeOptions::Defaults(), ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<Table>> Take(const Table& table, const Array& indices,
const TakeOptions& options = TakeOptions::Defaults(),
ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 1.0.0. Use Datum-based version")
ARROW_EXPORT
Result<std::shared_ptr<Table>> Take(const Table& table, const ChunkedArray& indices,
const TakeOptions& options = TakeOptions::Defaults(),
ExecContext* context = NULLPTR);

ARROW_DEPRECATED("Deprecated in 3.0.0. Use SortIndices()")
ARROW_EXPORT
Result<std::shared_ptr<Array>> SortToIndices(const Array& values,
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/arrow/csv/reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ class ARROW_EXPORT TableReader {
const ParseOptions&,
const ConvertOptions&);

ARROW_DEPRECATED("Use MemoryPool-less variant (the IOContext holds a pool already)")
ARROW_DEPRECATED(
"Deprecated in 4.0.0. "
"Use MemoryPool-less variant (the IOContext holds a pool already)")
static Result<std::shared_ptr<TableReader>> Make(
MemoryPool* pool, io::IOContext io_context, std::shared_ptr<io::InputStream> input,
const ReadOptions&, const ParseOptions&, const ConvertOptions&);
Expand Down Expand Up @@ -104,7 +106,7 @@ class ARROW_EXPORT StreamingReader : public RecordBatchReader {
io::IOContext io_context, std::shared_ptr<io::InputStream> input,
const ReadOptions&, const ParseOptions&, const ConvertOptions&);

ARROW_DEPRECATED("Use IOContext-based overload")
ARROW_DEPRECATED("Deprecated in 4.0.0. Use IOContext-based overload")
static Result<std::shared_ptr<StreamingReader>> Make(
MemoryPool* pool, std::shared_ptr<io::InputStream> input,
const ReadOptions& read_options, const ParseOptions& parse_options,
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/ipc/writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ Result<std::shared_ptr<RecordBatchWriter>> MakeFileWriter(

/// @}

ARROW_DEPRECATED("Use MakeStreamWriter")
ARROW_DEPRECATED("Deprecated in 3.0.0. Use MakeStreamWriter")
ARROW_EXPORT
Result<std::shared_ptr<RecordBatchWriter>> NewStreamWriter(
io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
const IpcWriteOptions& options = IpcWriteOptions::Defaults());

ARROW_DEPRECATED("Use MakeFileWriter")
ARROW_DEPRECATED("Deprecated in 2.0.0. Use MakeFileWriter")
ARROW_EXPORT
Result<std::shared_ptr<RecordBatchWriter>> NewFileWriter(
io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
Expand Down
9 changes: 0 additions & 9 deletions cpp/src/arrow/json/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ class TableReaderImpl : public TableReader,
std::shared_ptr<ChunkedArrayBuilder> builder_;
};

Status TableReader::Read(std::shared_ptr<Table>* out) { return Read().Value(out); }

Result<std::shared_ptr<TableReader>> TableReader::Make(
MemoryPool* pool, std::shared_ptr<io::InputStream> input,
const ReadOptions& read_options, const ParseOptions& parse_options) {
Expand All @@ -185,13 +183,6 @@ Result<std::shared_ptr<TableReader>> TableReader::Make(
return ptr;
}

Status TableReader::Make(MemoryPool* pool, std::shared_ptr<io::InputStream> input,
const ReadOptions& read_options,
const ParseOptions& parse_options,
std::shared_ptr<TableReader>* out) {
return TableReader::Make(pool, input, read_options, parse_options).Value(out);
}

Result<std::shared_ptr<RecordBatch>> ParseOne(ParseOptions options,
std::shared_ptr<Buffer> json) {
std::unique_ptr<BlockParser> parser;
Expand Down
8 changes: 0 additions & 8 deletions cpp/src/arrow/json/reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,11 @@ class ARROW_EXPORT TableReader {
/// Read the entire JSON file and convert it to a Arrow Table
virtual Result<std::shared_ptr<Table>> Read() = 0;

ARROW_DEPRECATED("Use Result-returning version")
Status Read(std::shared_ptr<Table>* out);

/// Create a TableReader instance
static Result<std::shared_ptr<TableReader>> Make(MemoryPool* pool,
std::shared_ptr<io::InputStream> input,
const ReadOptions&,
const ParseOptions&);

ARROW_DEPRECATED("Use Result-returning version")
static Status Make(MemoryPool* pool, std::shared_ptr<io::InputStream> input,
const ReadOptions&, const ParseOptions&,
std::shared_ptr<TableReader>* out);
};

ARROW_EXPORT Result<std::shared_ptr<RecordBatch>> ParseOne(ParseOptions options,
Expand Down
3 changes: 0 additions & 3 deletions cpp/src/arrow/python/pyarrow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ int import_pyarrow() {
} else { \
return UnwrapError(obj, #TYPE_NAME); \
} \
} \
Status unwrap_##FUNC_SUFFIX(PyObject* obj, std::shared_ptr<TYPE_NAME>* out) { \
return unwrap_##FUNC_SUFFIX(obj).Value(out); \
Copy link
Member

@jorisvandenbossche jorisvandenbossche Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removal broke the turbodbc integration tests. Apparently turbodbc was still using the version with *out, eg at https://github.com/blue-yonder/turbodbc/blob/be96fef1450de9cd77a506fdce141dda563fd8b3/cpp/turbodbc_arrow/Library/src/set_arrow_parameters.cpp#L427

Copy link
Member

@jorisvandenbossche jorisvandenbossche Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened ARROW-13594 to track the build failure on our side

}

DEFINE_WRAP_FUNCTIONS(buffer, Buffer)
Expand Down
13 changes: 5 additions & 8 deletions cpp/src/arrow/python/pyarrow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@ namespace py {
// Returns 0 on success, -1 on error.
ARROW_PYTHON_EXPORT int import_pyarrow();

#define DECLARE_WRAP_FUNCTIONS(FUNC_SUFFIX, TYPE_NAME) \
ARROW_PYTHON_EXPORT bool is_##FUNC_SUFFIX(PyObject*); \
ARROW_PYTHON_EXPORT Result<std::shared_ptr<TYPE_NAME>> unwrap_##FUNC_SUFFIX( \
PyObject*); \
ARROW_PYTHON_EXPORT PyObject* wrap_##FUNC_SUFFIX(const std::shared_ptr<TYPE_NAME>&); \
ARROW_DEPRECATED("Use Result-returning version") \
ARROW_PYTHON_EXPORT Status unwrap_##FUNC_SUFFIX(PyObject*, \
std::shared_ptr<TYPE_NAME>* out);
#define DECLARE_WRAP_FUNCTIONS(FUNC_SUFFIX, TYPE_NAME) \
ARROW_PYTHON_EXPORT bool is_##FUNC_SUFFIX(PyObject*); \
ARROW_PYTHON_EXPORT Result<std::shared_ptr<TYPE_NAME>> unwrap_##FUNC_SUFFIX( \
PyObject*); \
ARROW_PYTHON_EXPORT PyObject* wrap_##FUNC_SUFFIX(const std::shared_ptr<TYPE_NAME>&);

DECLARE_WRAP_FUNCTIONS(buffer, Buffer)

Expand Down
7 changes: 0 additions & 7 deletions cpp/src/arrow/sparse_tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,6 @@ class ARROW_EXPORT SparseTensor {
return ToTensor(default_memory_pool());
}

/// \brief Status-return version of ToTensor().
ARROW_DEPRECATED("Use Result-returning version")
Status ToTensor(std::shared_ptr<Tensor>* out) const { return ToTensor().Value(out); }
Status ToTensor(MemoryPool* pool, std::shared_ptr<Tensor>* out) const {
return ToTensor(pool).Value(out);
}

protected:
// Constructor with all attributes
SparseTensor(const std::shared_ptr<DataType>& type, const std::shared_ptr<Buffer>& data,
Expand Down
4 changes: 0 additions & 4 deletions cpp/src/arrow/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,6 @@ class ARROW_EXPORT Tensor {
/// Compute the number of non-zero values in the tensor
Result<int64_t> CountNonZero() const;

/// Compute the number of non-zero values in the tensor
ARROW_DEPRECATED("Use Result-returning version")
Status CountNonZero(int64_t* result) const { return CountNonZero().Value(result); }

/// Return the offset of the given index on the given strides
static int64_t CalculateValueOffset(const std::vector<int64_t>& strides,
const std::vector<int64_t>& index) {
Expand Down
15 changes: 3 additions & 12 deletions cpp/src/arrow/type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,13 @@ class ARROW_EXPORT DataType : public detail::Fingerprintable {
/// \brief Return whether the types are equal
bool Equals(const std::shared_ptr<DataType>& other) const;

ARROW_DEPRECATED("Use field(i)")
const std::shared_ptr<Field>& child(int i) const { return field(i); }

/// Returns the child-field at index i.
/// \brief Return the child field at index i.
const std::shared_ptr<Field>& field(int i) const { return children_[i]; }

ARROW_DEPRECATED("Use fields()")
const std::vector<std::shared_ptr<Field>>& children() const { return fields(); }

/// \brief Returns the children fields associated with this type.
/// \brief Return the children fields associated with this type.
const std::vector<std::shared_ptr<Field>>& fields() const { return children_; }

ARROW_DEPRECATED("Use num_fields()")
int num_children() const { return num_fields(); }

/// \brief Returns the number of children fields associated with this type.
/// \brief Return the number of children fields associated with this type.
int num_fields() const { return static_cast<int>(children_.size()); }

Status Accept(TypeVisitor* visitor) const;
Expand Down
69 changes: 4 additions & 65 deletions cpp/src/arrow/type_fwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,80 +536,19 @@ struct_(const std::vector<std::shared_ptr<Field>>& fields);
/// \brief Create a SparseUnionType instance
std::shared_ptr<DataType> ARROW_EXPORT sparse_union(FieldVector child_fields,
std::vector<int8_t> type_codes = {});
/// \brief Create a DenseUnionType instance
std::shared_ptr<DataType> ARROW_EXPORT dense_union(FieldVector child_fields,
std::vector<int8_t> type_codes = {});

/// \brief Create a SparseUnionType instance
std::shared_ptr<DataType> ARROW_EXPORT
sparse_union(const ArrayVector& children, std::vector<std::string> field_names = {},
std::vector<int8_t> type_codes = {});

/// \brief Create a DenseUnionType instance
std::shared_ptr<DataType> ARROW_EXPORT dense_union(FieldVector child_fields,
std::vector<int8_t> type_codes = {});
/// \brief Create a DenseUnionType instance
std::shared_ptr<DataType> ARROW_EXPORT
dense_union(const ArrayVector& children, std::vector<std::string> field_names = {},
std::vector<int8_t> type_codes = {});

/// \brief Create a UnionType instance
ARROW_DEPRECATED("Deprecated in 1.0.0")
inline std::shared_ptr<DataType> ARROW_EXPORT
union_(const std::vector<std::shared_ptr<Field>>& child_fields,
const std::vector<int8_t>& type_codes, UnionMode::type mode = UnionMode::SPARSE) {
if (mode == UnionMode::SPARSE) {
return sparse_union(child_fields, type_codes);
} else {
return dense_union(child_fields, type_codes);
}
}

/// \brief Create a UnionType instance
ARROW_DEPRECATED("Deprecated in 1.0.0")
inline std::shared_ptr<DataType> ARROW_EXPORT
union_(const std::vector<std::shared_ptr<Field>>& child_fields,
UnionMode::type mode = UnionMode::SPARSE) {
if (mode == UnionMode::SPARSE) {
return sparse_union(child_fields);
} else {
return dense_union(child_fields);
}
}

/// \brief Create a UnionType instance
ARROW_DEPRECATED("Deprecated in 1.0.0")
inline std::shared_ptr<DataType> ARROW_EXPORT
union_(const std::vector<std::shared_ptr<Array>>& children,
const std::vector<std::string>& field_names, const std::vector<int8_t>& type_codes,
UnionMode::type mode = UnionMode::SPARSE) {
if (mode == UnionMode::SPARSE) {
return sparse_union(children, field_names, type_codes);
} else {
return dense_union(children, field_names, type_codes);
}
}

/// \brief Create a UnionType instance
ARROW_DEPRECATED("Deprecated in 1.0.0")
inline std::shared_ptr<DataType> ARROW_EXPORT
union_(const std::vector<std::shared_ptr<Array>>& children,
const std::vector<std::string>& field_names,
UnionMode::type mode = UnionMode::SPARSE) {
if (mode == UnionMode::SPARSE) {
return sparse_union(children, field_names);
} else {
return dense_union(children, field_names);
}
}

/// \brief Create a UnionType instance
ARROW_DEPRECATED("Deprecated in 1.0.0")
inline std::shared_ptr<DataType> ARROW_EXPORT
union_(const std::vector<std::shared_ptr<Array>>& children,
UnionMode::type mode = UnionMode::SPARSE) {
if (mode == UnionMode::SPARSE) {
return sparse_union(children);
} else {
return dense_union(children);
}
}
/// \brief Create a DictionaryType instance
/// \param[in] index_type the type of the dictionary indices (must be
/// a signed integer)
Expand Down
22 changes: 0 additions & 22 deletions cpp/src/arrow/util/compiler_util.h
View file
Open in desktop

This file was deleted.

Loading