Repository: parquet-cpp Updated Branches: refs/heads/master 1c4492a11 -> 076011b08
PARQUET-880: Prevent destructors from throwing Author: Deepak Majeti <[email protected]> Closes #246 from majetideepak/PARQUET-880 and squashes the following commits: 9e5ce1b [Deepak Majeti] PARQUET-880: Prevent destructors from throwing Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/076011b0 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/076011b0 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/076011b0 Branch: refs/heads/master Commit: 076011b08498317d213cdbc0a64128a5dd8da4c0 Parents: 1c4492a Author: Deepak Majeti <[email protected]> Authored: Thu Feb 16 09:33:53 2017 -0500 Committer: Wes McKinney <[email protected]> Committed: Thu Feb 16 09:33:53 2017 -0500 ---------------------------------------------------------------------- src/parquet/file/reader-internal.cc | 4 +++- src/parquet/file/reader.cc | 4 +++- src/parquet/file/writer-internal.cc | 4 +++- src/parquet/file/writer.cc | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/076011b0/src/parquet/file/reader-internal.cc ---------------------------------------------------------------------- diff --git a/src/parquet/file/reader-internal.cc b/src/parquet/file/reader-internal.cc index e981e36..7b821b8 100644 --- a/src/parquet/file/reader-internal.cc +++ b/src/parquet/file/reader-internal.cc @@ -229,7 +229,9 @@ void SerializedFile::Close() { } SerializedFile::~SerializedFile() { - Close(); + try { + Close(); + } catch (...) {} } std::shared_ptr<RowGroupReader> SerializedFile::GetRowGroup(int i) { http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/076011b0/src/parquet/file/reader.cc ---------------------------------------------------------------------- diff --git a/src/parquet/file/reader.cc b/src/parquet/file/reader.cc index 4e46b8e..21baecd 100644 --- a/src/parquet/file/reader.cc +++ b/src/parquet/file/reader.cc @@ -67,7 +67,9 @@ const RowGroupMetaData* RowGroupReader::metadata() const { ParquetFileReader::ParquetFileReader() {} ParquetFileReader::~ParquetFileReader() { - Close(); + try { + Close(); + } catch (...) {} } std::unique_ptr<ParquetFileReader> ParquetFileReader::Open( http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/076011b0/src/parquet/file/writer-internal.cc ---------------------------------------------------------------------- diff --git a/src/parquet/file/writer-internal.cc b/src/parquet/file/writer-internal.cc index a0a62b9..ea8a338 100644 --- a/src/parquet/file/writer-internal.cc +++ b/src/parquet/file/writer-internal.cc @@ -246,7 +246,9 @@ RowGroupWriter* FileSerializer::AppendRowGroup(int64_t num_rows) { } FileSerializer::~FileSerializer() { - Close(); + try { + Close(); + } catch (...) {} } void FileSerializer::WriteMetaData() { http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/076011b0/src/parquet/file/writer.cc ---------------------------------------------------------------------- diff --git a/src/parquet/file/writer.cc b/src/parquet/file/writer.cc index 8d7d208..be46dbe 100644 --- a/src/parquet/file/writer.cc +++ b/src/parquet/file/writer.cc @@ -51,7 +51,9 @@ int RowGroupWriter::current_column() { ParquetFileWriter::ParquetFileWriter() {} ParquetFileWriter::~ParquetFileWriter() { - Close(); + try { + Close(); + } catch (...) {} } std::unique_ptr<ParquetFileWriter> ParquetFileWriter::Open(
