(arrow) branch main updated: GH-38852: [C++] Replace "#ifdef ARROW_WITH_GZIP" in dataset test to ARROW_WITH_ZLIB (#38853)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 8e28f6bd8d GH-38852: [C++] Replace "#ifdef ARROW_WITH_GZIP" in dataset 
test to ARROW_WITH_ZLIB (#38853)
8e28f6bd8d is described below

commit 8e28f6bd8d3df7f441a50a156b51046ac3587f59
Author: mwish <maplewish...@gmail.com>
AuthorDate: Thu Nov 23 09:12:36 2023 +0800

    GH-38852: [C++] Replace "#ifdef ARROW_WITH_GZIP" in dataset test to 
ARROW_WITH_ZLIB (#38853)
    
    
    
    ### Rationale for this change
    
    We don't define `ARROW_WITH_GZIP` macro when we can use gzip. We use 
`ARROW_WITH_ZLIB` instead. So `ARROW_WITH_ZLIB` is always not defined.
    
    ### What changes are included in this PR?
    
    change `ARROW_WITH_GZIP` to `ARROW_WITH_ZLIB`
    
    ### Are these changes tested?
    
    previously not tested, but now there're
    
    ### Are there any user-facing changes?
    
    no
    
    * Closes: #38852
    
    Authored-by: mwish <maplewish...@gmail.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 cpp/src/parquet/column_writer_test.cc    | 7 ++++---
 cpp/src/parquet/file_deserialize_test.cc | 2 +-
 cpp/src/parquet/file_serialize_test.cc   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cpp/src/parquet/column_writer_test.cc 
b/cpp/src/parquet/column_writer_test.cc
index 0d354f5c1a..59fc848d7f 100644
--- a/cpp/src/parquet/column_writer_test.cc
+++ b/cpp/src/parquet/column_writer_test.cc
@@ -308,8 +308,9 @@ class TestPrimitiveWriter : public 
PrimitiveTypedTest<TestType> {
     ColumnProperties column_properties(encoding, compression, 
enable_dictionary,
                                        enable_statistics);
     column_properties.set_codec_options(codec_options);
-    std::shared_ptr<TypedColumnWriter<TestType>> writer = this->BuildWriter(
-        num_rows, column_properties, ParquetVersion::PARQUET_1_0, 
enable_checksum);
+    std::shared_ptr<TypedColumnWriter<TestType>> writer =
+        this->BuildWriter(num_rows, column_properties, 
ParquetVersion::PARQUET_1_0,
+                          ParquetDataPageVersion::V1, enable_checksum);
     writer->WriteBatch(this->values_.size(), nullptr, nullptr, 
this->values_ptr_);
     // The behaviour should be independent from the number of Close() calls
     writer->Close();
@@ -557,7 +558,7 @@ TYPED_TEST(TestPrimitiveWriter, 
RequiredPlainWithStatsAndBrotliCompression) {
 
 #endif
 
-#ifdef ARROW_WITH_GZIP
+#ifdef ARROW_WITH_ZLIB
 TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithGzipCompression) {
   this->TestRequiredWithSettings(Encoding::PLAIN, Compression::GZIP, false, 
false,
                                  LARGE_SIZE);
diff --git a/cpp/src/parquet/file_deserialize_test.cc 
b/cpp/src/parquet/file_deserialize_test.cc
index 4377e714a2..6b3c7062fc 100644
--- a/cpp/src/parquet/file_deserialize_test.cc
+++ b/cpp/src/parquet/file_deserialize_test.cc
@@ -91,7 +91,7 @@ static std::vector<Compression::type> 
GetSupportedCodecTypes() {
   codec_types.push_back(Compression::BROTLI);
 #endif
 
-#ifdef ARROW_WITH_GZIP
+#ifdef ARROW_WITH_ZLIB
   codec_types.push_back(Compression::GZIP);
 #endif
 
diff --git a/cpp/src/parquet/file_serialize_test.cc 
b/cpp/src/parquet/file_serialize_test.cc
index 85bfd1c514..62e1965418 100644
--- a/cpp/src/parquet/file_serialize_test.cc
+++ b/cpp/src/parquet/file_serialize_test.cc
@@ -334,7 +334,7 @@ TYPED_TEST(TestSerialize, SmallFileBrotli) {
 }
 #endif
 
-#ifdef ARROW_WITH_GZIP
+#ifdef ARROW_WITH_ZLIB
 TYPED_TEST(TestSerialize, SmallFileGzip) {
   ASSERT_NO_FATAL_FAILURE(this->FileSerializeTest(Compression::GZIP));
 }