Skip to content

GH-50750: [C++][Parquet] Remove code marked as deprecated except flight in versions 23.0.0 and earlier #50751

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

Open
HuaHuaY wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-50750: [C++][Parquet] Remove code marked as deprecated except flight in versions 23.0.0 and earlier #50751

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
9 changes: 0 additions & 9 deletions cpp/src/arrow/testing/random.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,6 @@ std::shared_ptr<Array> RandomArrayGenerator::Date64(int64_t size, int64_t min,
memory_pool);
}

std::shared_ptr<Array> RandomArrayGenerator::Float16(int64_t size, uint16_t min,
uint16_t max,
double null_probability,
int64_t alignment,
MemoryPool* memory_pool) {
return this->Float16(size, Float16::FromBits(min), Float16::FromBits(max),
null_probability, /*nan_probability=*/0, alignment, memory_pool);
}

std::shared_ptr<Array> RandomArrayGenerator::Float16(
int64_t size, util::Float16 min, util::Float16 max, double null_probability,
double nan_probability, int64_t alignment, MemoryPool* memory_pool) {
Expand Down
21 changes: 0 additions & 21 deletions cpp/src/arrow/testing/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,27 +189,6 @@ class ARROW_TESTING_EXPORT RandomArrayGenerator {
int64_t alignment = kDefaultBufferAlignment,
MemoryPool* memory_pool = default_memory_pool());

/// \brief Generate a random HalfFloatArray
///
/// \param[in] size the size of the array to generate
/// \param[in] min the lower bound of the distribution
/// \param[in] max the upper bound of the distribution
/// \param[in] null_probability the probability of a value being null
/// \param[in] alignment alignment for memory allocations (in bytes)
/// \param[in] memory_pool memory pool to allocate memory from
///
/// \return a generated Array
///
/// \deprecated Deprecated in 22.0.0. Use the other Float16() method that accepts
/// nan_probability as a parameter
ARROW_DEPRECATED(
"Deprecated in 22.0.0. Use the other Float16() method that accepts nan_probability "
"as a parameter")
std::shared_ptr<Array> Float16(int64_t size, uint16_t min, uint16_t max,
double null_probability = 0,
int64_t alignment = kDefaultBufferAlignment,
MemoryPool* memory_pool = default_memory_pool());

/// \brief Generate a random HalfFloatArray
///
/// \param[in] size the size of the array to generate
Expand Down
38 changes: 0 additions & 38 deletions cpp/src/parquet/arrow/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,28 +1414,6 @@ std::shared_ptr<RowGroupReader> FileReaderImpl::RowGroup(int row_group_index) {
// ----------------------------------------------------------------------
// Public factory functions

Status FileReader::GetRecordBatchReader(std::shared_ptr<RecordBatchReader>* out) {
ARROW_ASSIGN_OR_RAISE(auto tmp, GetRecordBatchReader());
out->reset(tmp.release());
return Status::OK();
}

Status FileReader::GetRecordBatchReader(const std::vector<int>& row_group_indices,
std::shared_ptr<RecordBatchReader>* out) {
ARROW_ASSIGN_OR_RAISE(auto tmp, GetRecordBatchReader(row_group_indices));
out->reset(tmp.release());
return Status::OK();
}

Status FileReader::GetRecordBatchReader(const std::vector<int>& row_group_indices,
const std::vector<int>& column_indices,
std::shared_ptr<RecordBatchReader>* out) {
ARROW_ASSIGN_OR_RAISE(auto tmp,
GetRecordBatchReader(row_group_indices, column_indices));
out->reset(tmp.release());
return Status::OK();
}

Status FileReader::ReadTable(std::shared_ptr<Table>* out) {
ARROW_ASSIGN_OR_RAISE(*out, ReadTable());
return Status::OK();
Expand Down Expand Up @@ -1471,22 +1449,6 @@ Status FileReader::ReadRowGroups(const std::vector<int>& row_groups,
return Status::OK();
}

Status FileReader::Make(::arrow::MemoryPool* pool,
std::unique_ptr<ParquetFileReader> reader,
const ArrowReaderProperties& properties,
std::unique_ptr<FileReader>* out) {
ARROW_ASSIGN_OR_RAISE(*out, Make(pool, std::move(reader), properties));
return Status::OK();
}

Status FileReader::Make(::arrow::MemoryPool* pool,
std::unique_ptr<ParquetFileReader> reader,
std::unique_ptr<FileReader>* out) {
ARROW_ASSIGN_OR_RAISE(*out,
Make(pool, std::move(reader), default_arrow_reader_properties()));
return Status::OK();
}

Result<std::unique_ptr<FileReader>> FileReader::Make(
::arrow::MemoryPool* pool, std::unique_ptr<ParquetFileReader> parquet_reader,
const ArrowReaderProperties& properties) {
Expand Down
42 changes: 0 additions & 42 deletions cpp/src/parquet/arrow/reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,6 @@ class RowGroupReader;
// arrays
class PARQUET_EXPORT FileReader {
public:
/// Factory function to create a FileReader from a ParquetFileReader and properties
/// \deprecated Deprecated in 23.0.0. Use arrow::Result version instead.
ARROW_DEPRECATED("Deprecated in 23.0.0. Use arrow::Result version instead.")
static ::arrow::Status Make(::arrow::MemoryPool* pool,
std::unique_ptr<ParquetFileReader> reader,
const ArrowReaderProperties& properties,
std::unique_ptr<FileReader>* out);

/// Factory function to create a FileReader from a ParquetFileReader
/// \deprecated Deprecated in 23.0.0. Use arrow::Result version instead.
ARROW_DEPRECATED("Deprecated in 23.0.0. Use arrow::Result version instead.")
static ::arrow::Status Make(::arrow::MemoryPool* pool,
std::unique_ptr<ParquetFileReader> reader,
std::unique_ptr<FileReader>* out);

/// Factory function to create a FileReader from a ParquetFileReader and properties
static ::arrow::Result<std::unique_ptr<FileReader>> Make(
::arrow::MemoryPool* pool, std::unique_ptr<ParquetFileReader> reader,
Expand Down Expand Up @@ -192,33 +177,6 @@ class PARQUET_EXPORT FileReader {
GetRecordBatchReader(const std::vector<int>& row_group_indices,
const std::vector<int>& column_indices) = 0;

/// \brief Return a RecordBatchReader of row groups selected from
/// row_group_indices, whose columns are selected by column_indices.
///
/// Note that the ordering in row_group_indices and column_indices
/// matter. FileReaders must outlive their RecordBatchReaders.
///
/// \param row_group_indices which row groups to read (order determines read order).
/// \param column_indices which columns to read (order determines output schema).
/// \param[out] out record batch stream from parquet data.
///
/// \returns error Status if either row_group_indices or column_indices
/// contains an invalid index
/// \deprecated Deprecated in 21.0.0. Use arrow::Result version instead.
ARROW_DEPRECATED("Deprecated in 21.0.0. Use arrow::Result version instead.")
::arrow::Status GetRecordBatchReader(const std::vector<int>& row_group_indices,
const std::vector<int>& column_indices,
std::shared_ptr<::arrow::RecordBatchReader>* out);

/// \deprecated Deprecated in 21.0.0. Use arrow::Result version instead.
ARROW_DEPRECATED("Deprecated in 21.0.0. Use arrow::Result version instead.")
::arrow::Status GetRecordBatchReader(const std::vector<int>& row_group_indices,
std::shared_ptr<::arrow::RecordBatchReader>* out);

/// \deprecated Deprecated in 21.0.0. Use arrow::Result version instead.
ARROW_DEPRECATED("Deprecated in 21.0.0. Use arrow::Result version instead.")
::arrow::Status GetRecordBatchReader(std::shared_ptr<::arrow::RecordBatchReader>* out);

/// \brief Return a generator of record batches.
///
/// The FileReader must outlive the generator, so this requires that you pass in a
Expand Down
6 changes: 0 additions & 6 deletions cpp/src/parquet/encryption/encryption.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@ class PARQUET_EXPORT ColumnEncryptionProperties {
public:
class PARQUET_EXPORT Builder {
public:
PARQUET_DEPRECATED("name argument is ignored, use default constructor instead")
explicit Builder(const std::string& name) : encrypted_(true) {}

PARQUET_DEPRECATED("path argument is ignored, use default constructor instead")
explicit Builder(const schema::ColumnPath& path) : encrypted_(true) {}

Builder() = default;

/// Set a column-specific key.
Expand Down
Loading