Skip to content

Commit eccaba1

Browse files
committed
Some review feedback
1 parent 97cbf90 commit eccaba1

File tree

9 files changed

+144
-119
lines changed

9 files changed

+144
-119
lines changed

cpp/src/generated/parquet3_generated.h

Lines changed: 53 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cpp/src/parquet/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ add_arrow_lib(parquet
311311
STATIC_INSTALL_INTERFACE_LIBS
312312
${PARQUET_STATIC_INSTALL_INTERFACE_LIBS})
313313

314-
target_include_directories(parquet_objlib SYSTEM PRIVATE ${ARROW_SOURCE_DIR}/thirdparty/flatbuffers/include)
314+
target_include_directories(parquet_objlib SYSTEM
315+
PRIVATE ${ARROW_SOURCE_DIR}/thirdparty/flatbuffers/include)
315316

316317
if(WIN32 AND NOT (ARROW_TEST_LINKAGE STREQUAL "static"))
317318
add_library(parquet_test_support STATIC

cpp/src/parquet/file_reader.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,13 @@ class SerializedFile : public ParquetFileReader::Contents {
441441
PARQUET_ASSIGN_OR_THROW(
442442
auto footer_buffer,
443443
source_->ReadAt(source_size_ - footer_read_size, footer_read_size));
444-
if (properties_.read_metadata3()) {
444+
if (properties_.read_flatbuffer_metadata_if_present()) {
445445
// Try to extract flatbuffer metadata from footer
446446
std::string flatbuffer_data;
447447
auto result = ExtractFlatbuffer(footer_buffer, &flatbuffer_data);
448448
if (result.ok()) {
449-
int32_t required_or_consumed = *result;
450-
if (required_or_consumed > static_cast<int32_t>(footer_buffer->size())) {
449+
uint32_t required_or_consumed = *result;
450+
if (required_or_consumed > static_cast<uint32_t>(footer_buffer->size())) {
451451
PARQUET_ASSIGN_OR_THROW(
452452
footer_buffer,
453453
source_->ReadAt(source_size_ - required_or_consumed, required_or_consumed));
@@ -461,8 +461,8 @@ class SerializedFile : public ParquetFileReader::Contents {
461461
format3::GetFileMetaData(flatbuffer_data.data());
462462
auto thrift_metadata =
463463
std::make_unique<format::FileMetaData>(FromFlatbuffer(fb_metadata));
464-
file_metadata_ = FileMetaData::Make(
465-
std::move(thrift_metadata), static_cast<uint32_t>(*result), properties_);
464+
file_metadata_ =
465+
FileMetaData::Make(std::move(thrift_metadata), *result, properties_);
466466
return;
467467
}
468468
}

cpp/src/parquet/file_writer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ class PARQUET_EXPORT RowGroupWriter {
110110
};
111111

112112
PARQUET_EXPORT
113-
void WriteFileMetaData(const FileMetaData& file_metadata,
114-
::arrow::io::OutputStream* sink,
113+
void WriteFileMetaData(const FileMetaData& file_metadata, ::arrow::io::OutputStream* sink,
115114
bool use_metadata3 = false);
116115

117116
PARQUET_EXPORT

cpp/src/parquet/metadata.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#include <string>
2626
#include <vector>
2727

28+
#include "generated/parquet_types.h"
2829
#include "parquet/encryption/type_fwd.h"
2930
#include "parquet/index_location.h"
3031
#include "parquet/platform.h"
3132
#include "parquet/properties.h"
3233
#include "parquet/type_fwd.h"
33-
#include "generated/parquet_types.h"
3434

3535
namespace parquet {
3636

@@ -389,8 +389,8 @@ class PARQUET_EXPORT FileMetaData {
389389
const ReaderProperties& properties,
390390
std::shared_ptr<InternalFileDecryptor> file_decryptor = NULLPTR);
391391

392-
explicit FileMetaData(std::unique_ptr<format::FileMetaData> metadata, uint32_t metadata_len,
393-
const ReaderProperties& properties);
392+
explicit FileMetaData(std::unique_ptr<format::FileMetaData> metadata,
393+
uint32_t metadata_len, const ReaderProperties& properties);
394394

395395
void set_file_decryptor(std::shared_ptr<InternalFileDecryptor> file_decryptor);
396396
const std::shared_ptr<InternalFileDecryptor>& file_decryptor() const;

0 commit comments

Comments
 (0)