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

[skip appveyor] Closes #6359 from pitrou/ARROW-7524-gha-win-parquet and squashes the following commits: 73fea4c <Antoine Pitrou> ARROW-7524: Enable Parquet in the VS2019 GHA job Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
apache · Feb 7, 2020 · e1bccd0 · e1bccd0
1 parent b90370f
commit e1bccd0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -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
@@ -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
@@ -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:

diff --git a/cpp/src/arrow/stl.h b/cpp/src/arrow/stl.h
@@ -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; }
 

diff --git a/cpp/src/parquet/schema.h b/cpp/src/parquet/schema.h
@@ -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_;