You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/10/05 19:54:54 UTC
arrow git commit: ARROW-1539: [C++] Remove APIs deprecated as of
0.7.0 or prior releases
Repository: arrow
Updated Branches:
refs/heads/master 51905e5e4 -> bea3495dd
ARROW-1539: [C++] Remove APIs deprecated as of 0.7.0 or prior releases
Author: Wes McKinney <we...@twosigma.com>
Closes #1174 from wesm/ARROW-1539 and squashes the following commits:
188ad705 [Wes McKinney] Remove APIs deprecated as of 0.7.0 or prior releases
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/bea3495d
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/bea3495d
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/bea3495d
Branch: refs/heads/master
Commit: bea3495dd9ed18f6257f2f89aaea994e08707aac
Parents: 51905e5
Author: Wes McKinney <we...@twosigma.com>
Authored: Thu Oct 5 15:54:49 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Thu Oct 5 15:54:49 2017 -0400
----------------------------------------------------------------------
cpp/src/arrow/array-test.cc | 3 +--
cpp/src/arrow/array.cc | 30 ++----------------------------
cpp/src/arrow/array.h | 21 +--------------------
cpp/src/arrow/buffer.cc | 12 ------------
cpp/src/arrow/buffer.h | 5 -----
cpp/src/arrow/builder.cc | 34 ----------------------------------
cpp/src/arrow/builder.h | 36 ------------------------------------
cpp/src/arrow/compare.cc | 9 ++++-----
cpp/src/arrow/io/hdfs.h | 5 -----
cpp/src/arrow/ipc/reader.cc | 23 -----------------------
cpp/src/arrow/ipc/reader.h | 19 -------------------
cpp/src/arrow/ipc/writer.cc | 22 ----------------------
cpp/src/arrow/ipc/writer.h | 22 ----------------------
cpp/src/arrow/table.cc | 6 ------
cpp/src/arrow/table.h | 5 -----
cpp/src/arrow/tensor.cc | 4 +---
cpp/src/arrow/type.cc | 4 +---
cpp/src/arrow/util/bit-util.cc | 8 --------
cpp/src/arrow/util/bit-util.h | 26 --------------------------
cpp/src/plasma/io.cc | 6 +++---
20 files changed, 13 insertions(+), 287 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/array-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/array-test.cc b/cpp/src/arrow/array-test.cc
index ef10257..0b02c67 100644
--- a/cpp/src/arrow/array-test.cc
+++ b/cpp/src/arrow/array-test.cc
@@ -1051,8 +1051,7 @@ TEST_F(TestBinaryArray, TestGetString) {
ASSERT_TRUE(strings_->IsNull(i));
} else {
std::string val = strings_->GetString(i);
- ASSERT_EQ(0, std::memcmp(expected_[i].data(), val.c_str(),
- val.size()));
+ ASSERT_EQ(0, std::memcmp(expected_[i].data(), val.c_str(), val.size()));
}
}
}
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/array.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/array.cc b/cpp/src/arrow/array.cc
index a3a1e62..cd1721f 100644
--- a/cpp/src/arrow/array.cc
+++ b/cpp/src/arrow/array.cc
@@ -52,9 +52,7 @@ int64_t Array::null_count() const {
return data_->null_count;
}
-bool Array::Equals(const Array& arr) const {
- return ArrayEquals(*this, arr);
-}
+bool Array::Equals(const Array& arr) const { return ArrayEquals(*this, arr); }
bool Array::Equals(const std::shared_ptr<Array>& arr) const {
if (!arr) {
@@ -63,9 +61,7 @@ bool Array::Equals(const std::shared_ptr<Array>& arr) const {
return Equals(*arr);
}
-bool Array::ApproxEquals(const Array& arr) const {
- return ArrayApproxEquals(*this, arr);
-}
+bool Array::ApproxEquals(const Array& arr) const { return ArrayApproxEquals(*this, arr); }
bool Array::ApproxEquals(const std::shared_ptr<Array>& arr) const {
if (!arr) {
@@ -592,28 +588,6 @@ Status MakeArray(const std::shared_ptr<ArrayData>& data, std::shared_ptr<Array>*
return Status::OK();
}
-#ifndef ARROW_NO_DEPRECATED_API
-// \deprecated Since 0.7.0
-Status MakePrimitiveArray(const std::shared_ptr<DataType>& type, int64_t length,
- const std::shared_ptr<Buffer>& data,
- const std::shared_ptr<Buffer>& null_bitmap, int64_t null_count,
- int64_t offset, std::shared_ptr<Array>* out) {
- BufferVector buffers = {null_bitmap, data};
- auto internal_data =
- std::make_shared<ArrayData>(type, length, std::move(buffers), null_count, offset);
- return MakeArray(internal_data, out);
-}
-
-Status MakePrimitiveArray(const std::shared_ptr<DataType>& type,
- const std::vector<std::shared_ptr<Buffer>>& buffers,
- int64_t length, int64_t null_count, int64_t offset,
- std::shared_ptr<Array>* out) {
- auto internal_data =
- std::make_shared<ArrayData>(type, length, buffers, null_count, offset);
- return MakeArray(internal_data, out);
-}
-#endif
-
// ----------------------------------------------------------------------
// Instantiate templates
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/array.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/array.h b/cpp/src/arrow/array.h
index f668b6d..882c63c 100644
--- a/cpp/src/arrow/array.h
+++ b/cpp/src/arrow/array.h
@@ -451,8 +451,7 @@ class ARROW_EXPORT BinaryArray : public FlatArray {
std::string GetString(int64_t i) const {
int32_t length = 0;
const uint8_t* bytes = GetValue(i, &length);
- return std::string(reinterpret_cast<const char*>(bytes),
- static_cast<size_t>(length));
+ return std::string(reinterpret_cast<const char*>(bytes), static_cast<size_t>(length));
}
/// Note that this buffer does not account for any slice offset
@@ -684,24 +683,6 @@ ARROW_EXTERN_TEMPLATE NumericArray<TimestampType>;
ARROW_EXPORT
Status ValidateArray(const Array& array);
-#ifndef ARROW_NO_DEPRECATED_API
-// \note Deprecated since 0.7.0
-
-/// Create new arrays for logical types that are backed by primitive arrays.
-ARROW_EXPORT
-Status MakePrimitiveArray(const std::shared_ptr<DataType>& type, int64_t length,
- const std::shared_ptr<Buffer>& data,
- const std::shared_ptr<Buffer>& null_bitmap, int64_t null_count,
- int64_t offset, std::shared_ptr<Array>* out);
-
-ARROW_EXPORT
-Status MakePrimitiveArray(const std::shared_ptr<DataType>& type,
- const std::vector<std::shared_ptr<Buffer>>& buffers,
- int64_t length, int64_t null_count, int64_t offset,
- std::shared_ptr<Array>* out);
-
-#endif
-
} // namespace arrow
#endif // ARROW_ARRAY_H
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/buffer.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/buffer.cc b/cpp/src/arrow/buffer.cc
index e308ed2..1b8e437 100644
--- a/cpp/src/arrow/buffer.cc
+++ b/cpp/src/arrow/buffer.cc
@@ -132,18 +132,6 @@ Status AllocateBuffer(MemoryPool* pool, const int64_t size,
return Status::OK();
}
-#ifndef ARROW_NO_DEPRECATED_API
-
-Status AllocateBuffer(MemoryPool* pool, const int64_t size,
- std::shared_ptr<MutableBuffer>* out) {
- std::shared_ptr<Buffer> buffer;
- RETURN_NOT_OK(AllocateBuffer(pool, size, &buffer));
- *out = std::dynamic_pointer_cast<MutableBuffer>(buffer);
- return Status::OK();
-}
-
-#endif
-
Status AllocateResizableBuffer(MemoryPool* pool, const int64_t size,
std::shared_ptr<ResizableBuffer>* out) {
auto buffer = std::make_shared<PoolBuffer>(pool);
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/buffer.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/buffer.h b/cpp/src/arrow/buffer.h
index 5f61ade..b745812 100644
--- a/cpp/src/arrow/buffer.h
+++ b/cpp/src/arrow/buffer.h
@@ -339,11 +339,6 @@ Status AllocateResizableBuffer(MemoryPool* pool, const int64_t size,
#ifndef ARROW_NO_DEPRECATED_API
-/// \deprecated Since 0.7.0
-ARROW_EXPORT
-Status AllocateBuffer(MemoryPool* pool, const int64_t size,
- std::shared_ptr<MutableBuffer>* out);
-
/// \brief Create Buffer referencing std::string memory
/// \deprecated Since 0.8.0
///
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/builder.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/builder.cc b/cpp/src/arrow/builder.cc
index 0479dc5..55e7873 100644
--- a/cpp/src/arrow/builder.cc
+++ b/cpp/src/arrow/builder.cc
@@ -691,11 +691,6 @@ BooleanBuilder::BooleanBuilder(const std::shared_ptr<DataType>& type, MemoryPool
DCHECK_EQ(Type::BOOL, type->id());
}
-#ifndef ARROW_NO_DEPRECATED_API
-BooleanBuilder::BooleanBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type)
- : BooleanBuilder(type, pool) {}
-#endif
-
Status BooleanBuilder::Init(int64_t capacity) {
RETURN_NOT_OK(ArrayBuilder::Init(capacity));
data_ = std::make_shared<PoolBuffer>(pool_);
@@ -838,13 +833,6 @@ DictionaryBuilder<FixedSizeBinaryType>::DictionaryBuilder(
}
}
-#ifndef ARROW_NO_DEPRECATED_API
-template <typename T>
-DictionaryBuilder<T>::DictionaryBuilder(MemoryPool* pool,
- const std::shared_ptr<DataType>& type)
- : DictionaryBuilder(type, pool) {}
-#endif
-
template <typename T>
Status DictionaryBuilder<T>::Init(int64_t elements) {
RETURN_NOT_OK(ArrayBuilder::Init(elements));
@@ -1111,11 +1099,6 @@ template class DictionaryBuilder<StringType>;
DecimalBuilder::DecimalBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool)
: FixedSizeBinaryBuilder(type, pool) {}
-#ifndef ARROW_NO_DEPRECATED_API
-DecimalBuilder::DecimalBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type)
- : DecimalBuilder(type, pool) {}
-#endif
-
Status DecimalBuilder::Append(const Decimal128& value) {
RETURN_NOT_OK(FixedSizeBinaryBuilder::Reserve(1));
return FixedSizeBinaryBuilder::Append(value.ToBytes());
@@ -1212,11 +1195,6 @@ ArrayBuilder* ListBuilder::value_builder() const {
BinaryBuilder::BinaryBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool)
: ArrayBuilder(type, pool), offsets_builder_(pool), value_data_builder_(pool) {}
-#ifndef ARROW_NO_DEPRECATED_API
-BinaryBuilder::BinaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type)
- : BinaryBuilder(type, pool) {}
-#endif
-
BinaryBuilder::BinaryBuilder(MemoryPool* pool) : BinaryBuilder(binary(), pool) {}
Status BinaryBuilder::Init(int64_t elements) {
@@ -1316,12 +1294,6 @@ FixedSizeBinaryBuilder::FixedSizeBinaryBuilder(const std::shared_ptr<DataType>&
byte_width_(static_cast<const FixedSizeBinaryType&>(*type).byte_width()),
byte_builder_(pool) {}
-#ifndef ARROW_NO_DEPRECATED_API
-FixedSizeBinaryBuilder::FixedSizeBinaryBuilder(MemoryPool* pool,
- const std::shared_ptr<DataType>& type)
- : FixedSizeBinaryBuilder(type, pool) {}
-#endif
-
Status FixedSizeBinaryBuilder::Append(const uint8_t* value) {
RETURN_NOT_OK(Reserve(1));
UnsafeAppendToBitmap(true);
@@ -1377,12 +1349,6 @@ StructBuilder::StructBuilder(const std::shared_ptr<DataType>& type, MemoryPool*
field_builders_ = std::move(field_builders);
}
-#ifndef ARROW_NO_DEPRECATED_API
-StructBuilder::StructBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
- std::vector<std::unique_ptr<ArrayBuilder>>&& field_builders)
- : StructBuilder(type, pool, std::move(field_builders)) {}
-#endif
-
Status StructBuilder::Finish(std::shared_ptr<Array>* out) {
std::vector<std::shared_ptr<Array>> fields(field_builders_.size());
for (size_t i = 0; i < field_builders_.size(); ++i) {
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/builder.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/builder.h b/cpp/src/arrow/builder.h
index da7386a..1ddcf27 100644
--- a/cpp/src/arrow/builder.h
+++ b/cpp/src/arrow/builder.h
@@ -181,11 +181,6 @@ class ARROW_EXPORT PrimitiveBuilder : public ArrayBuilder {
explicit PrimitiveBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool)
: ArrayBuilder(type, pool), data_(nullptr), raw_data_(nullptr) {}
-#ifndef ARROW_NO_DEPRECATED_API
- explicit PrimitiveBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type)
- : PrimitiveBuilder(type, pool) {}
-#endif
-
using ArrayBuilder::Advance;
/// Write nulls as uint8_t* (0 value indicates null) into pre-allocated memory
@@ -514,11 +509,6 @@ class ARROW_EXPORT BooleanBuilder : public ArrayBuilder {
explicit BooleanBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- explicit BooleanBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type);
-#endif
-
using ArrayBuilder::Advance;
/// Write nulls as uint8_t* (0 value indicates null) into pre-allocated memory
@@ -667,11 +657,6 @@ class ARROW_EXPORT BinaryBuilder : public ArrayBuilder {
public:
explicit BinaryBuilder(MemoryPool* pool ARROW_MEMORY_POOL_DEFAULT);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- BinaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type);
-#endif
-
BinaryBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool);
Status Append(const uint8_t* value, int32_t length);
@@ -728,11 +713,6 @@ class ARROW_EXPORT StringBuilder : public BinaryBuilder {
class ARROW_EXPORT FixedSizeBinaryBuilder : public ArrayBuilder {
public:
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- FixedSizeBinaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type);
-#endif
-
FixedSizeBinaryBuilder(const std::shared_ptr<DataType>& type,
MemoryPool* pool ARROW_MEMORY_POOL_DEFAULT);
@@ -772,11 +752,6 @@ class ARROW_EXPORT DecimalBuilder : public FixedSizeBinaryBuilder {
explicit DecimalBuilder(const std::shared_ptr<DataType>& type,
MemoryPool* pool ARROW_MEMORY_POOL_DEFAULT);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- explicit DecimalBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type);
-#endif
-
using FixedSizeBinaryBuilder::Append;
Status Append(const Decimal128& val);
@@ -794,12 +769,6 @@ class ARROW_EXPORT DecimalBuilder : public FixedSizeBinaryBuilder {
/// called to maintain data-structure consistency.
class ARROW_EXPORT StructBuilder : public ArrayBuilder {
public:
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- StructBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
- std::vector<std::unique_ptr<ArrayBuilder>>&& field_builders);
-#endif
-
StructBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool,
std::vector<std::unique_ptr<ArrayBuilder>>&& field_builders);
@@ -888,11 +857,6 @@ class ARROW_EXPORT DictionaryBuilder : public ArrayBuilder {
~DictionaryBuilder() {}
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.6.0
- explicit DictionaryBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type);
-#endif
-
DictionaryBuilder(const std::shared_ptr<DataType>& type, MemoryPool* pool);
template <typename T1 = T>
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/compare.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/compare.cc b/cpp/src/arrow/compare.cc
index 984537f..94ea339 100644
--- a/cpp/src/arrow/compare.cc
+++ b/cpp/src/arrow/compare.cc
@@ -740,8 +740,8 @@ bool TensorEquals(const Tensor& left, const Tensor& right) {
are_equal = false;
} else {
const auto& type = static_cast<const FixedWidthType&>(*left.type());
- are_equal = StridedTensorContentEquals(0, 0, 0,
- type.bit_width() / 8, left, right);
+ are_equal =
+ StridedTensorContentEquals(0, 0, 0, type.bit_width() / 8, left, right);
}
} else {
const auto& size_meta = dynamic_cast<const FixedWidthType&>(*left.type());
@@ -791,9 +791,8 @@ Status ArrayApproxEquals(const Array& left, const Array& right, bool* are_equal)
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) {
+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, start_idx, end_idx, other_start_idx);
return Status::OK();
}
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/io/hdfs.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/io/hdfs.h b/cpp/src/arrow/io/hdfs.h
index 431ff5e..aaaafc8 100644
--- a/cpp/src/arrow/io/hdfs.h
+++ b/cpp/src/arrow/io/hdfs.h
@@ -172,11 +172,6 @@ class ARROW_EXPORT HadoopFileSystem : public FileSystem {
ARROW_DISALLOW_COPY_AND_ASSIGN(HadoopFileSystem);
};
-#ifndef ARROW_NO_DEPRECATED_API
-/// \deprecated Since 0.6.0
-using HdfsClient = HadoopFileSystem;
-#endif
-
class ARROW_EXPORT HdfsReadableFile : public RandomAccessFile {
public:
~HdfsReadableFile();
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/ipc/reader.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/reader.cc b/cpp/src/arrow/ipc/reader.cc
index 5d0f570..5fe9082 100644
--- a/cpp/src/arrow/ipc/reader.cc
+++ b/cpp/src/arrow/ipc/reader.cc
@@ -487,21 +487,6 @@ Status RecordBatchStreamReader::Open(const std::shared_ptr<io::InputStream>& str
return Open(std::move(message_reader), out);
}
-#ifndef ARROW_NO_DEPRECATED_API
-Status RecordBatchStreamReader::Open(std::unique_ptr<MessageReader> message_reader,
- std::shared_ptr<RecordBatchStreamReader>* reader) {
- // Private ctor
- *reader = std::shared_ptr<RecordBatchStreamReader>(new RecordBatchStreamReader());
- return (*reader)->impl_->Open(std::move(message_reader));
-}
-
-Status RecordBatchStreamReader::Open(const std::shared_ptr<io::InputStream>& stream,
- std::shared_ptr<RecordBatchStreamReader>* out) {
- std::unique_ptr<MessageReader> message_reader(new InputStreamMessageReader(stream));
- return Open(std::move(message_reader), out);
-}
-#endif
-
std::shared_ptr<Schema> RecordBatchStreamReader::schema() const {
return impl_->schema();
}
@@ -646,7 +631,6 @@ class RecordBatchFileReader::RecordBatchFileReaderImpl {
private:
io::RandomAccessFile* file_;
- // Deprecated as of 0.7.0
std::shared_ptr<io::RandomAccessFile> owned_file_;
// The location where the Arrow file layout ends. May be the end of the file
@@ -735,13 +719,6 @@ Status ReadRecordBatch(const std::shared_ptr<Schema>& schema, io::InputStream* f
out);
}
-// Deprecated
-Status ReadRecordBatch(const std::shared_ptr<Schema>& schema, int64_t offset,
- io::RandomAccessFile* file, std::shared_ptr<RecordBatch>* out) {
- RETURN_NOT_OK(file->Seek(offset));
- return ReadRecordBatch(schema, file, out);
-}
-
Status ReadTensor(int64_t offset, io::RandomAccessFile* file,
std::shared_ptr<Tensor>* out) {
// Respect alignment of Tensor messages (see WriteTensor)
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/ipc/reader.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/reader.h b/cpp/src/arrow/ipc/reader.h
index e90dc1e..1db282f 100644
--- a/cpp/src/arrow/ipc/reader.h
+++ b/cpp/src/arrow/ipc/reader.h
@@ -60,16 +60,6 @@ class ARROW_EXPORT RecordBatchStreamReader : public RecordBatchReader {
static Status Open(std::unique_ptr<MessageReader> message_reader,
std::shared_ptr<RecordBatchReader>* out);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.7.0
- static Status Open(std::unique_ptr<MessageReader> message_reader,
- std::shared_ptr<RecordBatchStreamReader>* out);
-
- /// \deprecated Since 0.7.0
- static Status Open(const std::shared_ptr<io::InputStream>& stream,
- std::shared_ptr<RecordBatchStreamReader>* out);
-#endif
-
/// \brief Record batch stream reader from InputStream
///
/// \param[in] stream an input stream instance. Must stay alive throughout
@@ -213,15 +203,6 @@ ARROW_EXPORT
Status ReadTensor(int64_t offset, io::RandomAccessFile* file,
std::shared_ptr<Tensor>* out);
-#ifndef ARROW_NO_DEPRECATED_API
-/// \deprecated Since 0.7.0
-///
-/// Deprecated in favor of more general InputStream-based API
-ARROW_EXPORT
-Status ReadRecordBatch(const std::shared_ptr<Schema>& schema, int64_t offset,
- io::RandomAccessFile* stream, std::shared_ptr<RecordBatch>* out);
-#endif
-
} // namespace ipc
} // namespace arrow
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/ipc/writer.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/writer.cc b/cpp/src/arrow/ipc/writer.cc
index e415c29..c321614 100644
--- a/cpp/src/arrow/ipc/writer.cc
+++ b/cpp/src/arrow/ipc/writer.cc
@@ -858,17 +858,6 @@ Status RecordBatchStreamWriter::Open(io::OutputStream* sink,
return Status::OK();
}
-#ifndef ARROW_NO_DEPRECATED_API
-Status RecordBatchStreamWriter::Open(io::OutputStream* sink,
- const std::shared_ptr<Schema>& schema,
- std::shared_ptr<RecordBatchStreamWriter>* out) {
- // ctor is private
- *out = std::shared_ptr<RecordBatchStreamWriter>(new RecordBatchStreamWriter());
- (*out)->impl_.reset(new RecordBatchStreamWriterImpl(sink, schema));
- return Status::OK();
-}
-#endif
-
Status RecordBatchStreamWriter::Close() { return impl_->Close(); }
// ----------------------------------------------------------------------
@@ -932,17 +921,6 @@ Status RecordBatchFileWriter::Open(io::OutputStream* sink,
return Status::OK();
}
-#ifndef ARROW_NO_DEPRECATED_API
-Status RecordBatchFileWriter::Open(io::OutputStream* sink,
- const std::shared_ptr<Schema>& schema,
- std::shared_ptr<RecordBatchFileWriter>* out) {
- // ctor is private
- *out = std::shared_ptr<RecordBatchFileWriter>(new RecordBatchFileWriter());
- (*out)->impl_.reset(new RecordBatchFileWriterImpl(sink, schema));
- return Status::OK();
-}
-#endif
-
Status RecordBatchFileWriter::WriteRecordBatch(const RecordBatch& batch,
bool allow_64bit) {
return impl_->WriteRecordBatch(batch, allow_64bit);
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/ipc/writer.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/writer.h b/cpp/src/arrow/ipc/writer.h
index 89d3f5f..585373b 100644
--- a/cpp/src/arrow/ipc/writer.h
+++ b/cpp/src/arrow/ipc/writer.h
@@ -94,12 +94,6 @@ class ARROW_EXPORT RecordBatchStreamWriter : public RecordBatchWriter {
static Status Open(io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
std::shared_ptr<RecordBatchWriter>* out);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.7.0
- static Status Open(io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
- std::shared_ptr<RecordBatchStreamWriter>* out);
-#endif
-
Status WriteRecordBatch(const RecordBatch& batch, bool allow_64bit = false) override;
Status Close() override;
void set_memory_pool(MemoryPool* pool) override;
@@ -128,12 +122,6 @@ class ARROW_EXPORT RecordBatchFileWriter : public RecordBatchStreamWriter {
static Status Open(io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
std::shared_ptr<RecordBatchWriter>* out);
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.7.0
- static Status Open(io::OutputStream* sink, const std::shared_ptr<Schema>& schema,
- std::shared_ptr<RecordBatchFileWriter>* out);
-#endif
-
Status WriteRecordBatch(const RecordBatch& batch, bool allow_64bit = false) override;
Status Close() override;
@@ -231,16 +219,6 @@ ARROW_EXPORT
Status WriteTensor(const Tensor& tensor, io::OutputStream* dst, int32_t* metadata_length,
int64_t* body_length);
-#ifndef ARROW_NO_DEPRECATED_API
-/// EXPERIMENTAL: Write RecordBatch allowing lengths over INT32_MAX. This data
-/// may not be readable by all Arrow implementations
-/// \deprecated Since 0.7.0
-ARROW_EXPORT
-Status WriteLargeRecordBatch(const RecordBatch& batch, int64_t buffer_start_offset,
- io::OutputStream* dst, int32_t* metadata_length,
- int64_t* body_length, MemoryPool* pool);
-#endif
-
} // namespace ipc
} // namespace arrow
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/table.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/table.cc b/cpp/src/arrow/table.cc
index 009b5cf..aac5dad 100644
--- a/cpp/src/arrow/table.cc
+++ b/cpp/src/arrow/table.cc
@@ -503,12 +503,6 @@ Status MakeTable(const std::shared_ptr<Schema>& schema,
RecordBatchReader::~RecordBatchReader() {}
-#ifndef ARROW_NO_DEPRECATED_API
-Status RecordBatchReader::ReadNextRecordBatch(std::shared_ptr<RecordBatch>* batch) {
- return ReadNext(batch);
-}
-#endif
-
// ----------------------------------------------------------------------
// Convert a table to a sequence of record batches
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/table.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/table.h b/cpp/src/arrow/table.h
index 709a666..d40bdb8 100644
--- a/cpp/src/arrow/table.h
+++ b/cpp/src/arrow/table.h
@@ -294,11 +294,6 @@ class ARROW_EXPORT RecordBatchReader {
/// \param[out] batch the next loaded batch, nullptr at end of stream
/// \return Status
virtual Status ReadNext(std::shared_ptr<RecordBatch>* batch) = 0;
-
-#ifndef ARROW_NO_DEPRECATED_API
- /// \deprecated Since 0.7.0
- Status ReadNextRecordBatch(std::shared_ptr<RecordBatch>* batch);
-#endif
};
/// \brief Compute a sequence of record batches from a (possibly chunked) Table
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/tensor.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/tensor.cc b/cpp/src/arrow/tensor.cc
index ed7da8b..465f724 100644
--- a/cpp/src/arrow/tensor.cc
+++ b/cpp/src/arrow/tensor.cc
@@ -117,8 +117,6 @@ bool Tensor::is_column_major() const {
Type::type Tensor::type_id() const { return type_->id(); }
-bool Tensor::Equals(const Tensor& other) const {
- return TensorEquals(*this, other);
-}
+bool Tensor::Equals(const Tensor& other) const { return TensorEquals(*this, other); }
} // namespace arrow
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/type.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/type.cc b/cpp/src/arrow/type.cc
index 14ddd2a..a9bf591 100644
--- a/cpp/src/arrow/type.cc
+++ b/cpp/src/arrow/type.cc
@@ -82,9 +82,7 @@ std::string Field::ToString() const {
DataType::~DataType() {}
-bool DataType::Equals(const DataType& other) const {
- return TypeEquals(*this, other);
-}
+bool DataType::Equals(const DataType& other) const { return TypeEquals(*this, other); }
bool DataType::Equals(const std::shared_ptr<DataType>& other) const {
if (!other) {
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/util/bit-util.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/util/bit-util.cc b/cpp/src/arrow/util/bit-util.cc
index e0116cc..4dd91e9 100644
--- a/cpp/src/arrow/util/bit-util.cc
+++ b/cpp/src/arrow/util/bit-util.cc
@@ -104,14 +104,6 @@ Status GetEmptyBitmap(MemoryPool* pool, int64_t length, std::shared_ptr<Buffer>*
return Status::OK();
}
-Status GetEmptyBitmap(MemoryPool* pool, int64_t length,
- std::shared_ptr<MutableBuffer>* result) {
- std::shared_ptr<Buffer> buffer;
- RETURN_NOT_OK(GetEmptyBitmap(pool, length, &buffer));
- *result = std::dynamic_pointer_cast<MutableBuffer>(buffer);
- return Status::OK();
-}
-
Status CopyBitmap(MemoryPool* pool, const uint8_t* data, int64_t offset, int64_t length,
std::shared_ptr<Buffer>* out) {
std::shared_ptr<Buffer> buffer;
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/arrow/util/bit-util.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/util/bit-util.h b/cpp/src/arrow/util/bit-util.h
index a85aff7..dd10245 100644
--- a/cpp/src/arrow/util/bit-util.h
+++ b/cpp/src/arrow/util/bit-util.h
@@ -49,25 +49,6 @@
namespace arrow {
-#ifndef ARROW_NO_DEPRECATED_API
-
-// \deprecated Since > 0.7.0
-
-#define INIT_BITSET(valid_bits_vector, valid_bits_index) \
- int64_t byte_offset_##valid_bits_vector = (valid_bits_index) / 8; \
- int64_t bit_offset_##valid_bits_vector = (valid_bits_index) % 8; \
- uint8_t bitset_##valid_bits_vector = valid_bits_vector[byte_offset_##valid_bits_vector];
-
-#define READ_NEXT_BITSET(valid_bits_vector) \
- bit_offset_##valid_bits_vector++; \
- if (bit_offset_##valid_bits_vector == 8) { \
- bit_offset_##valid_bits_vector = 0; \
- byte_offset_##valid_bits_vector++; \
- bitset_##valid_bits_vector = valid_bits_vector[byte_offset_##valid_bits_vector]; \
- }
-
-#endif
-
// TODO(wesm): The source from Impala was depending on boost::make_unsigned
//
// We add a partial stub implementation here
@@ -522,13 +503,6 @@ ARROW_EXPORT
bool BitmapEquals(const uint8_t* left, int64_t left_offset, const uint8_t* right,
int64_t right_offset, int64_t bit_length);
-#ifndef ARROW_NO_DEPRECATED_API
-/// \deprecated Since 0.7.0
-ARROW_EXPORT
-Status GetEmptyBitmap(MemoryPool* pool, int64_t length,
- std::shared_ptr<MutableBuffer>* result);
-#endif
-
} // namespace arrow
#endif // ARROW_UTIL_BIT_UTIL_H
http://git-wip-us.apache.org/repos/asf/arrow/blob/bea3495d/cpp/src/plasma/io.cc
----------------------------------------------------------------------
diff --git a/cpp/src/plasma/io.cc b/cpp/src/plasma/io.cc
index d604078..3134ff1 100644
--- a/cpp/src/plasma/io.cc
+++ b/cpp/src/plasma/io.cc
@@ -95,9 +95,9 @@ Status ReadMessage(int fd, int64_t* type, std::vector<uint8_t>* buffer) {
RETURN_NOT_OK_ELSE(ReadBytes(fd, reinterpret_cast<uint8_t*>(type), sizeof(*type)),
*type = DISCONNECT_CLIENT);
int64_t length_temp;
- RETURN_NOT_OK_ELSE(ReadBytes(fd, reinterpret_cast<uint8_t*>(&length_temp),
- sizeof(length_temp)),
- *type = DISCONNECT_CLIENT);
+ RETURN_NOT_OK_ELSE(
+ ReadBytes(fd, reinterpret_cast<uint8_t*>(&length_temp), sizeof(length_temp)),
+ *type = DISCONNECT_CLIENT);
// The length must be read as an int64_t, but it should be used as a size_t.
size_t length = length_temp;
if (length > buffer->size()) {