Skip to content

Commit

Permalink
Revert "[BugFix] Fix arrow parquet exception handling (StarRocks#25621)"
Browse files Browse the repository at this point in the history
This reverts commit f610fdf.
  • Loading branch information
letian-jiang committed Jun 25, 2023
1 parent 92f73d2 commit efdd391
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 28 deletions.
4 changes: 4 additions & 0 deletions be/src/formats/parquet/file_writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,11 @@ Status SyncFileWriter::_flush_row_group() {
_chunk_writer->close();
} catch (const ::parquet::ParquetStatusException& e) {
_chunk_writer.reset();

// this is to avoid calling ParquetFileWriter.Close which incurs segfault
_closed = true;
_writer.release();

auto st = Status::IOError(fmt::format("{}: {}", "flush rowgroup error", e.what()));
LOG(WARNING) << st;
return st;
Expand Down
8 changes: 1 addition & 7 deletions thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -477,19 +477,13 @@ fi
echo "Finished patching $SERDES_SOURCE"
cd -

# patch arrows
# patch arrows to use our built jemalloc
if [[ -d $TP_SOURCE_DIR/$ARROW_SOURCE ]] ; then
cd $TP_SOURCE_DIR/$ARROW_SOURCE
# use our built jemalloc
if [ ! -f $PATCHED_MARK ] && [ $ARROW_SOURCE = "arrow-apache-arrow-5.0.0" ] ; then
patch -p1 < $TP_PATCH_DIR/arrow-5.0.0-force-use-external-jemalloc.patch
touch $PATCHED_MARK
fi
# fix arrow parquet exception handling
if [ ! -f $PATCHED_MARK ] && [ $ARROW_SOURCE = "arrow-apache-arrow-5.0.0" ] ; then
patch -p1 < $TP_PATCH_DIR/arrow-5.0.0-fix-exception-handling.patch
touch $PATCHED_MARK
fi
cd -
echo "Finished patching $ARROW_SOURCE"
fi
21 changes: 0 additions & 21 deletions thirdparty/patches/arrow-5.0.0-fix-exception-handling.patch

This file was deleted.

0 comments on commit efdd391

Please sign in to comment.