Skip to content

Commit eae56fa

Browse files
committed
Simplify PageEncodingStats
1 parent 54ac1eb commit eae56fa

File tree

3 files changed

+4
-49
lines changed

3 files changed

+4
-49
lines changed

cpp/src/parquet/metadata.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,10 @@ class ColumnChunkMetaData::ColumnChunkMetaDataImpl {
214214
for (auto encoding : column_metadata_->encodings) {
215215
encodings_.push_back(FromThrift(encoding));
216216
}
217-
auto fromthrift = [](format::PageEncodingStats page_encoding_stats) {
218-
return parquet::PageEncodingStats(FromThrift(page_encoding_stats.page_type),
219-
FromThrift(page_encoding_stats.encoding),
220-
page_encoding_stats.count);
221-
};
222217
for (auto encoding_stats : column_metadata_->encoding_stats) {
223-
encoding_stats_.push_back(fromthrift(encoding_stats));
218+
encoding_stats_.push_back({FromThrift(encoding_stats.page_type),
219+
FromThrift(encoding_stats.encoding),
220+
encoding_stats.count});
224221
}
225222
possible_stats_ = nullptr;
226223
}

cpp/src/parquet/types.cc

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -335,24 +335,6 @@ SortOrder::type GetSortOrder(const std::shared_ptr<const LogicalType>& logical_t
335335
ColumnOrder ColumnOrder::undefined_ = ColumnOrder(ColumnOrder::UNDEFINED);
336336
ColumnOrder ColumnOrder::type_defined_ = ColumnOrder(ColumnOrder::TYPE_DEFINED_ORDER);
337337

338-
void PageEncodingStats::set_page_type(const PageType::type val) { this->page_type = val; }
339-
340-
void PageEncodingStats::set_encoding(const Encoding::type val) { this->encoding = val; }
341-
342-
void PageEncodingStats::set_count(const int32_t val) { this->count = val; }
343-
344-
PageEncodingStats::PageEncodingStats(const PageEncodingStats& obj) {
345-
page_type = obj.page_type;
346-
encoding = obj.encoding;
347-
count = obj.count;
348-
}
349-
PageEncodingStats& PageEncodingStats::operator=(const PageEncodingStats& obj) {
350-
page_type = obj.page_type;
351-
encoding = obj.encoding;
352-
count = obj.count;
353-
return *this;
354-
}
355-
356338
// Static methods for LogicalType class
357339

358340
std::shared_ptr<const LogicalType> LogicalType::FromConvertedType(

cpp/src/parquet/types.h

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -503,34 +503,10 @@ class ColumnOrder {
503503
};
504504

505505
// parquet::PageEncodingStats
506-
class PARQUET_EXPORT PageEncodingStats {
507-
public:
508-
PageEncodingStats(const PageEncodingStats&);
509-
PageEncodingStats(PageEncodingStats&&) = default;
510-
PageEncodingStats& operator=(const PageEncodingStats&);
511-
PageEncodingStats& operator=(PageEncodingStats&&) = default;
512-
PageEncodingStats()
513-
: page_type((PageType::type)0), encoding((Encoding::type)0), count(0) {}
514-
PageEncodingStats(PageType::type page_type_, Encoding::type encoding_, int32_t count_)
515-
: page_type((page_type_)), encoding(encoding_), count(count_) {}
516-
506+
struct PageEncodingStats {
517507
PageType::type page_type;
518508
Encoding::type encoding;
519509
int32_t count;
520-
521-
void set_page_type(const PageType::type val);
522-
523-
void set_encoding(const Encoding::type val);
524-
525-
void set_count(const int32_t val);
526-
527-
bool operator==(const PageEncodingStats& rhs) const {
528-
if (!(page_type == rhs.page_type)) return false;
529-
if (!(encoding == rhs.encoding)) return false;
530-
if (!(count == rhs.count)) return false;
531-
return true;
532-
}
533-
bool operator!=(const PageEncodingStats& rhs) const { return !(*this == rhs); }
534510
};
535511

536512
// ----------------------------------------------------------------------

0 commit comments

Comments
 (0)