Skip to content

Commit 4e680c4

Browse files
wesmwesm
committed
ARROW-8224: [C++] Remove APIs deprecated prior to 0.16.0
Closes apache#6735 from wesm/ARROW-8224 Authored-by: Wes McKinney <wesm+git@apache.org> Signed-off-by: Wes McKinney <wesm+git@apache.org>
1 parent 6981cf8 commit 4e680c4

28 files changed

Lines changed: 53 additions & 614 deletions

‎cpp/src/arrow/array.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,12 +1224,6 @@ class ARROW_EXPORT UnionArray : public Array {
12241224

12251225
const type_code_t* raw_type_codes() const { return raw_type_codes_ + data_->offset; }
12261226

1227-
ARROW_DEPRECATED("Use UnionArray::type_codes")
1228-
std::shared_ptr<Buffer> type_ids() const { return type_codes(); }
1229-
1230-
ARROW_DEPRECATED("Use UnionArray::raw_type_codes")
1231-
const type_code_t* raw_type_ids() const { return raw_type_codes(); }
1232-
12331227
/// The physical child id containing value at index.
12341228
int child_id(int64_t i) const {
12351229
return union_type_->child_ids()[raw_type_codes_[i + data_->offset]];

‎cpp/src/arrow/csv/reader.cc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -504,19 +504,5 @@ Result<std::shared_ptr<TableReader>> TableReader::Make(
504504
return reader;
505505
}
506506

507-
/////////////////////////////////////////////////////////////////////////
508-
// Deprecated API(s)
509-
510-
Status TableReader::Make(MemoryPool* pool, std::shared_ptr<io::InputStream> input,
511-
const ReadOptions& read_options,
512-
const ParseOptions& parse_options,
513-
const ConvertOptions& convert_options,
514-
std::shared_ptr<TableReader>* out) {
515-
return Make(pool, std::move(input), read_options, parse_options, convert_options)
516-
.Value(out);
517-
}
518-
519-
Status TableReader::Read(std::shared_ptr<Table>* out) { return Read().Value(out); }
520-
521507
} // namespace csv
522508
} // namespace arrow

‎cpp/src/arrow/csv/reader.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,12 @@ class ARROW_EXPORT TableReader {
3939
/// Read the entire CSV file and convert it to a Arrow Table
4040
virtual Result<std::shared_ptr<Table>> Read() = 0;
4141

42-
ARROW_DEPRECATED("Use Result-returning overload")
43-
virtual Status Read(std::shared_ptr<Table>* out);
44-
4542
/// Create a TableReader instance
4643
static Result<std::shared_ptr<TableReader>> Make(MemoryPool* pool,
4744
std::shared_ptr<io::InputStream> input,
4845
const ReadOptions&,
4946
const ParseOptions&,
5047
const ConvertOptions&);
51-
52-
ARROW_DEPRECATED("Use Result-returning overload")
53-
static Status Make(MemoryPool* pool, std::shared_ptr<io::InputStream> input,
54-
const ReadOptions&, const ParseOptions&, const ConvertOptions&,
55-
std::shared_ptr<TableReader>* out);
5648
};
5749

5850
} // namespace csv

‎cpp/src/arrow/io/buffered.cc‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,6 @@ Result<std::shared_ptr<BufferedOutputStream>> BufferedOutputStream::Create(
209209
return result;
210210
}
211211

212-
Status BufferedOutputStream::Create(int64_t buffer_size, MemoryPool* pool,
213-
std::shared_ptr<OutputStream> raw,
214-
std::shared_ptr<BufferedOutputStream>* out) {
215-
return Create(buffer_size, pool, std::move(raw)).Value(out);
216-
}
217-
218212
BufferedOutputStream::~BufferedOutputStream() { internal::CloseFromDestructor(this); }
219213

220214
Status BufferedOutputStream::SetBufferSize(int64_t new_buffer_size) {
@@ -229,10 +223,6 @@ Result<std::shared_ptr<OutputStream>> BufferedOutputStream::Detach() {
229223
return impl_->Detach();
230224
}
231225

232-
Status BufferedOutputStream::Detach(std::shared_ptr<OutputStream>* raw) {
233-
return Detach().Value(raw);
234-
}
235-
236226
Status BufferedOutputStream::Close() { return impl_->Close(); }
237227

238228
Status BufferedOutputStream::Abort() { return impl_->Abort(); }
@@ -453,13 +443,6 @@ Result<std::shared_ptr<BufferedInputStream>> BufferedInputStream::Create(
453443
return result;
454444
}
455445

456-
Status BufferedInputStream::Create(int64_t buffer_size, MemoryPool* pool,
457-
std::shared_ptr<InputStream> raw,
458-
std::shared_ptr<BufferedInputStream>* out,
459-
int64_t raw_total_bytes_bound) {
460-
return Create(buffer_size, pool, std::move(raw)).Value(out);
461-
}
462-
463446
Status BufferedInputStream::DoClose() { return impl_->Close(); }
464447

465448
Status BufferedInputStream::DoAbort() { return impl_->Abort(); }

‎cpp/src/arrow/io/buffered.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ class ARROW_EXPORT BufferedOutputStream : public OutputStream {
4747
static Result<std::shared_ptr<BufferedOutputStream>> Create(
4848
int64_t buffer_size, MemoryPool* pool, std::shared_ptr<OutputStream> raw);
4949

50-
ARROW_DEPRECATED("Use Result-returning overload")
51-
static Status Create(int64_t buffer_size, MemoryPool* pool,
52-
std::shared_ptr<OutputStream> raw,
53-
std::shared_ptr<BufferedOutputStream>* out);
54-
5550
/// \brief Resize internal buffer
5651
/// \param[in] new_buffer_size the new buffer size
5752
/// \return Status
@@ -69,9 +64,6 @@ class ARROW_EXPORT BufferedOutputStream : public OutputStream {
6964
/// \return the underlying OutputStream
7065
Result<std::shared_ptr<OutputStream>> Detach();
7166

72-
ARROW_DEPRECATED("Use Result-returning overload")
73-
Status Detach(std::shared_ptr<OutputStream>* raw);
74-
7567
// OutputStream interface
7668

7769
/// \brief Close the buffered output stream. This implicitly closes the
@@ -118,12 +110,6 @@ class ARROW_EXPORT BufferedInputStream
118110
int64_t buffer_size, MemoryPool* pool, std::shared_ptr<InputStream> raw,
119111
int64_t raw_read_bound = -1);
120112

121-
ARROW_DEPRECATED("Use Result-returning overload")
122-
static Status Create(int64_t buffer_size, MemoryPool* pool,
123-
std::shared_ptr<InputStream> raw,
124-
std::shared_ptr<BufferedInputStream>* out,
125-
int64_t raw_read_bound = -1);
126-
127113
/// \brief Resize internal read buffer; calls to Read(...) will read at least
128114
/// \param[in] new_buffer_size the new read buffer size
129115
/// \return Status

‎cpp/src/arrow/io/compressed.cc‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -206,18 +206,6 @@ Result<std::shared_ptr<CompressedOutputStream>> CompressedOutputStream::Make(
206206
return res;
207207
}
208208

209-
Status CompressedOutputStream::Make(util::Codec* codec,
210-
const std::shared_ptr<OutputStream>& raw,
211-
std::shared_ptr<CompressedOutputStream>* out) {
212-
return Make(codec, raw).Value(out);
213-
}
214-
215-
Status CompressedOutputStream::Make(MemoryPool* pool, util::Codec* codec,
216-
const std::shared_ptr<OutputStream>& raw,
217-
std::shared_ptr<CompressedOutputStream>* out) {
218-
return Make(codec, raw, pool).Value(out);
219-
}
220-
221209
CompressedOutputStream::~CompressedOutputStream() { internal::CloseFromDestructor(this); }
222210

223211
Status CompressedOutputStream::Close() { return impl_->Close(); }
@@ -429,17 +417,6 @@ Result<std::shared_ptr<CompressedInputStream>> CompressedInputStream::Make(
429417
return Status::OK();
430418
}
431419

432-
Status CompressedInputStream::Make(Codec* codec, const std::shared_ptr<InputStream>& raw,
433-
std::shared_ptr<CompressedInputStream>* out) {
434-
return Make(codec, raw).Value(out);
435-
}
436-
437-
Status CompressedInputStream::Make(MemoryPool* pool, Codec* codec,
438-
const std::shared_ptr<InputStream>& raw,
439-
std::shared_ptr<CompressedInputStream>* out) {
440-
return Make(codec, raw, pool).Value(out);
441-
}
442-
443420
CompressedInputStream::~CompressedInputStream() { internal::CloseFromDestructor(this); }
444421

445422
Status CompressedInputStream::DoClose() { return impl_->Close(); }

‎cpp/src/arrow/io/compressed.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ class ARROW_EXPORT CompressedOutputStream : public OutputStream {
4848
util::Codec* codec, const std::shared_ptr<OutputStream>& raw,
4949
MemoryPool* pool = default_memory_pool());
5050

51-
ARROW_DEPRECATED("Use Result-returning overload")
52-
static Status Make(util::Codec* codec, const std::shared_ptr<OutputStream>& raw,
53-
std::shared_ptr<CompressedOutputStream>* out);
54-
ARROW_DEPRECATED("Use Result-returning overload")
55-
static Status Make(MemoryPool* pool, util::Codec* codec,
56-
const std::shared_ptr<OutputStream>& raw,
57-
std::shared_ptr<CompressedOutputStream>* out);
58-
5951
// OutputStream interface
6052

6153
/// \brief Close the compressed output stream. This implicitly closes the
@@ -94,14 +86,6 @@ class ARROW_EXPORT CompressedInputStream
9486
util::Codec* codec, const std::shared_ptr<InputStream>& raw,
9587
MemoryPool* pool = default_memory_pool());
9688

97-
ARROW_DEPRECATED("Use Result-returning overload")
98-
static Status Make(util::Codec* codec, const std::shared_ptr<InputStream>& raw,
99-
std::shared_ptr<CompressedInputStream>* out);
100-
ARROW_DEPRECATED("Use Result-returning overload")
101-
static Status Make(MemoryPool* pool, util::Codec* codec,
102-
const std::shared_ptr<InputStream>& raw,
103-
std::shared_ptr<CompressedInputStream>* out);
104-
10589
// InputStream interface
10690

10791
bool closed() const override;

‎cpp/src/arrow/io/file.cc‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -285,23 +285,6 @@ Result<std::shared_ptr<ReadableFile>> ReadableFile::Open(int fd, MemoryPool* poo
285285
return file;
286286
}
287287

288-
Status ReadableFile::Open(const std::string& path, std::shared_ptr<ReadableFile>* file) {
289-
return Open(path).Value(file);
290-
}
291-
292-
Status ReadableFile::Open(const std::string& path, MemoryPool* pool,
293-
std::shared_ptr<ReadableFile>* file) {
294-
return Open(path, pool).Value(file);
295-
}
296-
297-
Status ReadableFile::Open(int fd, std::shared_ptr<ReadableFile>* file) {
298-
return Open(fd).Value(file);
299-
}
300-
301-
Status ReadableFile::Open(int fd, MemoryPool* pool, std::shared_ptr<ReadableFile>* file) {
302-
return Open(fd, pool).Value(file);
303-
}
304-
305288
Status ReadableFile::DoClose() { return impl_->Close(); }
306289

307290
bool ReadableFile::closed() const { return !impl_->is_open(); }
@@ -359,34 +342,6 @@ Result<std::shared_ptr<FileOutputStream>> FileOutputStream::Open(int fd) {
359342
return stream;
360343
}
361344

362-
Status FileOutputStream::Open(const std::string& path,
363-
std::shared_ptr<OutputStream>* out) {
364-
return Open(path, false).Value(out);
365-
}
366-
367-
Status FileOutputStream::Open(const std::string& path, bool append,
368-
std::shared_ptr<OutputStream>* out) {
369-
return Open(path, append).Value(out);
370-
}
371-
372-
Status FileOutputStream::Open(int fd, std::shared_ptr<OutputStream>* out) {
373-
return Open(fd).Value(out);
374-
}
375-
376-
Status FileOutputStream::Open(const std::string& path,
377-
std::shared_ptr<FileOutputStream>* out) {
378-
return Open(path, false).Value(out);
379-
}
380-
381-
Status FileOutputStream::Open(const std::string& path, bool append,
382-
std::shared_ptr<FileOutputStream>* out) {
383-
return Open(path, append).Value(out);
384-
}
385-
386-
Status FileOutputStream::Open(int fd, std::shared_ptr<FileOutputStream>* out) {
387-
return Open(fd).Value(out);
388-
}
389-
390345
Status FileOutputStream::Close() { return impl_->Close(); }
391346

392347
bool FileOutputStream::closed() const { return !impl_->is_open(); }
@@ -632,11 +587,6 @@ Result<std::shared_ptr<MemoryMappedFile>> MemoryMappedFile::Create(
632587
return MemoryMappedFile::Open(path, FileMode::READWRITE);
633588
}
634589

635-
Status MemoryMappedFile::Create(const std::string& path, int64_t size,
636-
std::shared_ptr<MemoryMappedFile>* out) {
637-
return Create(path, size).Value(out);
638-
}
639-
640590
Result<std::shared_ptr<MemoryMappedFile>> MemoryMappedFile::Open(const std::string& path,
641591
FileMode::type mode) {
642592
std::shared_ptr<MemoryMappedFile> result(new MemoryMappedFile());
@@ -657,17 +607,6 @@ Result<std::shared_ptr<MemoryMappedFile>> MemoryMappedFile::Open(const std::stri
657607
return result;
658608
}
659609

660-
Status MemoryMappedFile::Open(const std::string& path, FileMode::type mode,
661-
std::shared_ptr<MemoryMappedFile>* out) {
662-
return Open(path, mode).Value(out);
663-
}
664-
665-
Status MemoryMappedFile::Open(const std::string& path, FileMode::type mode,
666-
const int64_t offset, const int64_t length,
667-
std::shared_ptr<MemoryMappedFile>* out) {
668-
return Open(path, mode, offset, length).Value(out);
669-
}
670-
671610
Result<int64_t> MemoryMappedFile::GetSize() {
672611
RETURN_NOT_OK(memory_map_->CheckClosed());
673612
return memory_map_->size();

‎cpp/src/arrow/io/file.h‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ class ARROW_EXPORT FileOutputStream : public OutputStream {
5050
static Result<std::shared_ptr<FileOutputStream>> Open(const std::string& path,
5151
bool append = false);
5252

53-
ARROW_DEPRECATED("Use Result-returning overload")
54-
static Status Open(const std::string& path, std::shared_ptr<OutputStream>* out);
55-
ARROW_DEPRECATED("Use Result-returning overload")
56-
static Status Open(const std::string& path, bool append,
57-
std::shared_ptr<OutputStream>* out);
58-
ARROW_DEPRECATED("Use Result-returning overload")
59-
static Status Open(const std::string& path, std::shared_ptr<FileOutputStream>* file);
60-
ARROW_DEPRECATED("Use Result-returning overload")
61-
static Status Open(const std::string& path, bool append,
62-
std::shared_ptr<FileOutputStream>* file);
63-
6453
/// \brief Open a file descriptor for writing. The underlying file isn't
6554
/// truncated.
6655
/// \param[in] fd file descriptor
@@ -70,11 +59,6 @@ class ARROW_EXPORT FileOutputStream : public OutputStream {
7059
/// on Close() or destruction.
7160
static Result<std::shared_ptr<FileOutputStream>> Open(int fd);
7261

73-
ARROW_DEPRECATED("Use Result-returning overload")
74-
static Status Open(int fd, std::shared_ptr<OutputStream>* out);
75-
ARROW_DEPRECATED("Use Result-returning overload")
76-
static Status Open(int fd, std::shared_ptr<FileOutputStream>* out);
77-
7862
// OutputStream interface
7963
Status Close() override;
8064
bool closed() const override;
@@ -112,12 +96,6 @@ class ARROW_EXPORT ReadableFile
11296
static Result<std::shared_ptr<ReadableFile>> Open(
11397
const std::string& path, MemoryPool* pool = default_memory_pool());
11498

115-
ARROW_DEPRECATED("Use Result-returning overload")
116-
static Status Open(const std::string& path, std::shared_ptr<ReadableFile>* file);
117-
ARROW_DEPRECATED("Use Result-returning overload")
118-
static Status Open(const std::string& path, MemoryPool* pool,
119-
std::shared_ptr<ReadableFile>* file);
120-
12199
/// \brief Open a local file for reading
122100
/// \param[in] fd file descriptor
123101
/// \param[in] pool a MemoryPool for memory allocations
@@ -128,11 +106,6 @@ class ARROW_EXPORT ReadableFile
128106
static Result<std::shared_ptr<ReadableFile>> Open(
129107
int fd, MemoryPool* pool = default_memory_pool());
130108

131-
ARROW_DEPRECATED("Use Result-returning overload")
132-
static Status Open(int fd, std::shared_ptr<ReadableFile>* file);
133-
ARROW_DEPRECATED("Use Result-returning overload")
134-
static Status Open(int fd, MemoryPool* pool, std::shared_ptr<ReadableFile>* file);
135-
136109
bool closed() const override;
137110

138111
int file_descriptor() const;
@@ -175,28 +148,16 @@ class ARROW_EXPORT MemoryMappedFile : public ReadWriteFileInterface {
175148
static Result<std::shared_ptr<MemoryMappedFile>> Create(const std::string& path,
176149
int64_t size);
177150

178-
ARROW_DEPRECATED("Use Result-returning overload")
179-
static Status Create(const std::string& path, int64_t size,
180-
std::shared_ptr<MemoryMappedFile>* out);
181-
182151
// mmap() with whole file
183152
static Result<std::shared_ptr<MemoryMappedFile>> Open(const std::string& path,
184153
FileMode::type mode);
185154

186-
ARROW_DEPRECATED("Use Result-returning overload")
187-
static Status Open(const std::string& path, FileMode::type mode,
188-
std::shared_ptr<MemoryMappedFile>* out);
189-
190155
// mmap() with a region of file, the offset must be a multiple of the page size
191156
static Result<std::shared_ptr<MemoryMappedFile>> Open(const std::string& path,
192157
FileMode::type mode,
193158
const int64_t offset,
194159
const int64_t length);
195160

196-
ARROW_DEPRECATED("Use Result-returning overload")
197-
static Status Open(const std::string& path, FileMode::type mode, const int64_t offset,
198-
const int64_t length, std::shared_ptr<MemoryMappedFile>* out);
199-
200161
Status Close() override;
201162

202163
bool closed() const override;

‎cpp/src/arrow/io/hdfs.cc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -648,20 +648,6 @@ Status HadoopFileSystem::Rename(const std::string& src, const std::string& dst)
648648
return impl_->Rename(src, dst);
649649
}
650650

651-
// Deprecated in 0.11
652-
653-
Status HadoopFileSystem::OpenWriteable(const std::string& path, bool append,
654-
int32_t buffer_size, int16_t replication,
655-
int64_t default_block_size,
656-
std::shared_ptr<HdfsOutputStream>* file) {
657-
return OpenWritable(path, append, buffer_size, replication, default_block_size, file);
658-
}
659-
660-
Status HadoopFileSystem::OpenWriteable(const std::string& path, bool append,
661-
std::shared_ptr<HdfsOutputStream>* file) {
662-
return OpenWritable(path, append, 0, 0, 0, file);
663-
}
664-
665651
// ----------------------------------------------------------------------
666652
// Allow public API users to check whether we are set up correctly
667653

0 commit comments

Comments
 (0)