Skip to content

Commit

Permalink
s3select: remove compilation warnings (#156)
Browse files Browse the repository at this point in the history
One warning prevents rgw compilation against 15.0.0. This removes one
additional warning in which a deprecated version of a function was
called.

Signed-off-by: J. Eric Ivancich <[email protected]>
  • Loading branch information
ivancich authored May 3, 2024
1 parent eb40d36 commit f333ec8
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions include/s3select_parquet_intrf.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ class RGWimpl : public ObjectInterface {
#if ARROW_VERSION_MAJOR < 9
fd_ = -1;
#else
fd_.Close();
return fd_.Close();
#endif
//RETURN_NOT_OK(::arrow::internal::FileClose(fd));
}
Expand Down Expand Up @@ -1244,9 +1244,13 @@ void SerializedFile::ParseMetaDataOfEncryptedFileWithEncryptedFooter(
std::to_string(metadata_buffer->size()) + " bytes)");
}

#if ARROW_VERSION_MAJOR > 9
file_metadata_ =
FileMetaData::Make(metadata_buffer->data(), &metadata_len, default_reader_properties(), file_decryptor_);
#else
file_metadata_ =
FileMetaData::Make(metadata_buffer->data(), &metadata_len, file_decryptor_);
//FileMetaData::Make(metadata_buffer->data(), &metadata_len, default_reader_properties(), file_decryptor_); //version>9
#endif
}

void SerializedFile::ParseMetaDataOfEncryptedFileWithPlaintextFooter(
Expand Down

0 comments on commit f333ec8

Please sign in to comment.