Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-7524: [C++][CI] Enable Parquet in the VS2019 GHA job #6359

Closed
wants to merge 1 commit into from
Closed

ARROW-7524: [C++][CI] Enable Parquet in the VS2019 GHA job #6359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .github/workflows/cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
name: Windows 2019
generator: Visual Studio 16 2019
env:
CMAKE_ARGS: '-A x64'
CMAKE_ARGS: '-A x64 -DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL-Win64'
CMAKE_GENERATOR: ${{ matrix.generator }}
CMAKE_INSTALL_LIBDIR: bin
CMAKE_INSTALL_PREFIX: /usr
Expand All @@ -162,12 +162,12 @@ jobs:
ARROW_JEMALLOC: OFF
ARROW_FLIGHT: OFF
ARROW_HDFS: ON
ARROW_PARQUET: OFF
ARROW_WITH_ZLIB: OFF
ARROW_PARQUET: ON
ARROW_WITH_ZLIB: ON
ARROW_WITH_LZ4: OFF
ARROW_WITH_BZ2: OFF
ARROW_WITH_ZSTD: OFF
ARROW_WITH_SNAPPY: OFF
ARROW_WITH_ZSTD: ON
ARROW_WITH_SNAPPY: ON
ARROW_WITH_BROTLI: OFF
ARROW_USE_GLOG: OFF
ARROW_BUILD_TESTS: ON
Expand All @@ -182,8 +182,8 @@ jobs:
run: reg add "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f
- name: Installed Packages
run: choco list -l
- name: Install Boost
run: choco install -y boost-msvc-14.1
- name: Install Dependencies
run: choco install -y --no-progress openssl boost-msvc-14.1
- name: Checkout Arrow
uses: actions/checkout@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/stl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ class allocator {
explicit allocator(MemoryPool* pool) noexcept : pool_(pool) {}

template <class U>
allocator(const allocator<U>& rhs) noexcept : pool_(rhs.pool_) {}
allocator(const allocator<U>& rhs) noexcept : pool_(rhs.pool()) {}

~allocator() { pool_ = NULLPTR; }

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/schema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class PARQUET_EXPORT SchemaDescriptor {
// -- -- b |
// -- -- -- c |
// -- -- -- -- d
std::unordered_map<int, const schema::NodePtr> leaf_to_base_;
std::unordered_map<int, schema::NodePtr> leaf_to_base_;

// Mapping between ColumnPath DotString to the leaf index
std::unordered_multimap<std::string, int> leaf_to_idx_;
Expand Down