[
https://issues.apache.org/jira/browse/ARROW-2180?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16373088#comment-16373088
]
ASF GitHub Bot commented on ARROW-2180:
---
wesm closed pull request #1638: ARROW-2180: [C++] Remove deprecated APIs from
0.8.0 cycle
URL: https://github.com/apache/arrow/pull/1638
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/src/arrow/array.cc b/cpp/src/arrow/array.cc
index a8043d69b..83142dfef 100644
--- a/cpp/src/arrow/array.cc
+++ b/cpp/src/arrow/array.cc
@@ -140,15 +140,6 @@ PrimitiveArray::PrimitiveArray(const
std::shared_ptr& type, int64_t le
SetData(ArrayData::Make(type, length, {null_bitmap, data}, null_count,
offset));
}
-#ifndef ARROW_NO_DEPRECATED_API
-
-const uint8_t* PrimitiveArray::raw_values() const {
- return raw_values_ +
- offset() * static_cast(*type()).bit_width() /
CHAR_BIT;
-}
-
-#endif
-
template
NumericArray::NumericArray(const std::shared_ptr& data)
: PrimitiveArray(data) {
@@ -752,17 +743,6 @@ class ArrayDataWrapper {
} // namespace internal
-#ifndef ARROW_NO_DEPRECATED_API
-
-Status MakeArray(const std::shared_ptr& data,
std::shared_ptr* out) {
- internal::ArrayDataWrapper wrapper_visitor(data, out);
- RETURN_NOT_OK(VisitTypeInline(*data->type, _visitor));
- DCHECK(out);
- return Status::OK();
-}
-
-#endif
-
std::shared_ptr MakeArray(const std::shared_ptr& data) {
std::shared_ptr out;
internal::ArrayDataWrapper wrapper_visitor(data, );
diff --git a/cpp/src/arrow/array.h b/cpp/src/arrow/array.h
index 5b9ce9a01..faa9211c6 100644
--- a/cpp/src/arrow/array.h
+++ b/cpp/src/arrow/array.h
@@ -146,13 +146,6 @@ struct ARROW_EXPORT ArrayData {
std::shared_ptr Copy() const { return
std::make_shared(*this); }
-#ifndef ARROW_NO_DEPRECATED_API
-
- // Deprecated since 0.8.0
- std::shared_ptr ShallowCopy() const { return Copy(); }
-
-#endif
-
std::shared_ptr type;
int64_t length;
int64_t null_count;
@@ -161,19 +154,6 @@ struct ARROW_EXPORT ArrayData {
std::vector child_data;
};
-#ifndef ARROW_NO_DEPRECATED_API
-
-/// \brief Create a strongly-typed Array instance from generic ArrayData
-/// \param[in] data the array contents
-/// \param[out] out the resulting Array instance
-/// \return Status
-///
-/// \note Deprecated since 0.8.0
-ARROW_EXPORT
-Status MakeArray(const std::shared_ptr& data,
std::shared_ptr* out);
-
-#endif
-
/// \brief Create a strongly-typed Array instance from generic ArrayData
/// \param[in] data the array contents
/// \return the resulting Array instance
@@ -335,15 +315,6 @@ class ARROW_EXPORT PrimitiveArray : public FlatArray {
/// Does not account for any slice offset
std::shared_ptr values() const { return data_->buffers[1]; }
-#ifndef ARROW_NO_DEPRECATED_API
-
- /// \brief Return pointer to start of raw data
- ///
- /// \note Deprecated since 0.8.0
- const uint8_t* raw_values() const;
-
-#endif
-
protected:
PrimitiveArray() {}
diff --git a/cpp/src/arrow/buffer.h b/cpp/src/arrow/buffer.h
index 74a3c680d..cf25ccd03 100644
--- a/cpp/src/arrow/buffer.h
+++ b/cpp/src/arrow/buffer.h
@@ -371,22 +371,6 @@ ARROW_EXPORT
Status AllocateResizableBuffer(MemoryPool* pool, const int64_t size,
std::shared_ptr* out);
-#ifndef ARROW_NO_DEPRECATED_API
-
-/// \brief Create Buffer referencing std::string memory
-///
-/// Warning: string instance must stay alive
-///
-/// \param str std::string instance
-/// \return std::shared_ptr
-///
-/// \note Deprecated Since 0.8.0
-static inline std::shared_ptr GetBufferFromString(const std::string&
str) {
- return std::make_shared(str);
-}
-
-#endif // ARROW_NO_DEPRECATED_API
-
} // namespace arrow
#endif // ARROW_BUFFER_H
diff --git a/cpp/src/arrow/compare.cc b/cpp/src/arrow/compare.cc
index 9ed54ca3a..69cacbfac 100644
--- a/cpp/src/arrow/compare.cc
+++ b/cpp/src/arrow/compare.cc
@@ -783,30 +783,4 @@ bool TypeEquals(const DataType& left, const DataType&
right) {
return are_equal;
}
-Status ArrayEquals(const Array& left, const Array& right, bool* are_equal) {
- *are_equal = ArrayEquals(left, right);
- return Status::OK();
-}
-
-Status TensorEquals(const Tensor& left, const Tensor& right, bool* are_equal) {
- *are_equal = TensorEquals(left, right);
- return Status::OK();
-}
-
-Status ArrayApproxEquals(const Array& left, const Array& right, bool*
are_equal) {
- *are_equal = ArrayApproxEquals(left, right);
- return Status::OK();
-}
-
-Status ArrayRangeEquals(const Array& left, const Array& right, int64_t
start_idx,
-int64_t end_idx, int64_t other_start_idx, bool*
are_equal) {
- *are_equal = ArrayRangeEquals(left, right,
