Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .github/workflows/build-thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
'autoconf'
'libtool-bin'
'pkg-config'
'cmake'
'cmake=3.22.1-1ubuntu1.22.04.2'
'ninja-build'
'ccache'
'python-is-python3'
Expand All @@ -107,6 +107,7 @@ jobs:
)

sudo apt update
sudo apt-cache policy cmake
sudo DEBIAN_FRONTEND=noninteractive apt install --yes "${packages[@]}"

mkdir -p "${DEFAULT_DIR}"
Expand Down Expand Up @@ -153,7 +154,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
'cmake'
'ninja'
'ccache'
'bison'
Expand All @@ -167,8 +167,16 @@ jobs:
'llvm@16'
)

# Install packages except cmake
brew install "${packages[@]}" || true

# Install specific version of cmake
brew unlink cmake || true
wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-macos-universal.tar.gz
tar -xzf cmake-3.22.1-macos-universal.tar.gz
sudo cp -r cmake-3.22.1-macos-universal/CMake.app/Contents/* /usr/local/
cmake --version

- name: Build
run: |
export MACOSX_DEPLOYMENT_TARGET=12.0
Expand Down Expand Up @@ -204,7 +212,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
'cmake'
'ninja'
'ccache'
'bison'
Expand All @@ -218,8 +225,16 @@ jobs:
'llvm@16'
)

# Install packages except cmake
brew install "${packages[@]}" || true

# Install specific version of cmake
brew unlink cmake || true
wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-macos-universal.tar.gz
tar -xzf cmake-3.22.1-macos-universal.tar.gz
sudo cp -r cmake-3.22.1-macos-universal/CMake.app/Contents/* /usr/local/
cmake --version

- name: Build
run: |
export MACOSX_DEPLOYMENT_TARGET=12.0
Expand Down
1 change: 1 addition & 0 deletions thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ if [[ "${ARROW_SOURCE}" == "apache-arrow-7.0.0" ]]; then
cd "${TP_SOURCE_DIR}/${ARROW_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/apache-arrow-7.0.0.patch"
patch -p1 <"${TP_PATCH_DIR}/apache-arrow-7.0.0-exception-handling.patch"
touch "${PATCHED_MARK}"
fi
cd -
Expand Down
24 changes: 24 additions & 0 deletions thirdparty/patches/apache-arrow-7.0.0-exception-handling.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/cpp/src/parquet/file_writer.cc b/cpp/src/parquet/file_writer.cc
index deac9586e..572e8bde7 100644
--- a/cpp/src/parquet/file_writer.cc
+++ b/cpp/src/parquet/file_writer.cc
@@ -181,15 +181,13 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
closed_ = true;
CheckRowsWritten();

- for (size_t i = 0; i < column_writers_.size(); i++) {
- if (column_writers_[i]) {
- total_bytes_written_ += column_writers_[i]->Close();
- column_writers_[i].reset();
+ auto column_writers = std::move(column_writers_);
+ for (size_t i = 0; i < column_writers.size(); i++) {
+ if (column_writers[i]) {
+ total_bytes_written_ += column_writers[i]->Close();
}
}

- column_writers_.clear();
-
// Ensures all columns have been written
metadata_->set_num_rows(num_rows_);
metadata_->Finish(total_bytes_written_, row_group_ordinal_);
Loading