You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/01/04 17:54:06 UTC
[arrow] branch master updated: ARROW-4149: [CI/C++] Parquet test
misses ZSTD compression codec in CMake 3.2 nightly builds
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 1e9a236 ARROW-4149: [CI/C++] Parquet test misses ZSTD compression codec in CMake 3.2 nightly builds
1e9a236 is described below
commit 1e9a23612d258cd51a20b9eccf7a13bd5be52007
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Fri Jan 4 11:53:57 2019 -0600
ARROW-4149: [CI/C++] Parquet test misses ZSTD compression codec in CMake 3.2 nightly builds
Parquet Zstd tests were enabled regardless `ARROW_WITH_ZSTD` which can be set to [OFF](https://github.com/apache/arrow/blob/master/cpp/CMakeLists.txt#L271) depending CMake's version.
Crossbow build:
- ~[kszucs/crossbow/build-392](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-392)~
- [kszucs/crossbow/build-395](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-395)
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #3299 from kszucs/ARROW-4149 and squashes the following commits:
525ef76f1 <Krisztián Szűcs> lint
b29bda570 <Krisztián Szűcs> disable more tests
54e6437fe <Krisztián Szűcs> only run Zstd tests if ARROW_WITH_ZSTD is set
---
cpp/src/arrow/io/compressed-test.cc | 16 ++++++++++------
cpp/src/parquet/CMakeLists.txt | 5 +++++
cpp/src/parquet/column_writer-test.cc | 14 +++++++++-----
cpp/src/parquet/file-deserialize-test.cc | 8 +++++---
cpp/src/parquet/file-serialize-test.cc | 2 ++
5 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/cpp/src/arrow/io/compressed-test.cc b/cpp/src/arrow/io/compressed-test.cc
index 507302f..a099fbb 100644
--- a/cpp/src/arrow/io/compressed-test.cc
+++ b/cpp/src/arrow/io/compressed-test.cc
@@ -199,12 +199,14 @@ TEST_P(CompressedInputStreamTest, InvalidData) {
INSTANTIATE_TEST_CASE_P(TestGZipInputStream, CompressedInputStreamTest,
::testing::Values(Compression::GZIP));
-INSTANTIATE_TEST_CASE_P(TestZSTDInputStream, CompressedInputStreamTest,
- ::testing::Values(Compression::ZSTD));
-
INSTANTIATE_TEST_CASE_P(TestBrotliInputStream, CompressedInputStreamTest,
::testing::Values(Compression::BROTLI));
+#ifdef ARROW_WITH_ZSTD
+INSTANTIATE_TEST_CASE_P(TestZSTDInputStream, CompressedInputStreamTest,
+ ::testing::Values(Compression::ZSTD));
+#endif
+
class CompressedOutputStreamTest : public ::testing::TestWithParam<Compression::type> {
protected:
Compression::type GetCompression() { return GetParam(); }
@@ -235,11 +237,13 @@ TEST_P(CompressedOutputStreamTest, RandomData) {
INSTANTIATE_TEST_CASE_P(TestGZipOutputStream, CompressedOutputStreamTest,
::testing::Values(Compression::GZIP));
-INSTANTIATE_TEST_CASE_P(TestZSTDOutputStream, CompressedOutputStreamTest,
- ::testing::Values(Compression::ZSTD));
-
INSTANTIATE_TEST_CASE_P(TestBrotliOutputStream, CompressedOutputStreamTest,
::testing::Values(Compression::BROTLI));
+#ifdef ARROW_WITH_ZSTD
+INSTANTIATE_TEST_CASE_P(TestZSTDOutputStream, CompressedOutputStreamTest,
+ ::testing::Values(Compression::ZSTD));
+#endif
+
} // namespace io
} // namespace arrow
diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt
index 4eb8f68..f679672 100644
--- a/cpp/src/parquet/CMakeLists.txt
+++ b/cpp/src/parquet/CMakeLists.txt
@@ -282,3 +282,8 @@ ADD_ARROW_BENCHMARK(encoding-benchmark
PREFIX "parquet"
LABELS "parquet-benchmarks"
EXTRA_LINK_LIBS ${PARQUET_BENCHMARK_LINK_LIBRARIES})
+
+# Required for tests, the ExternalProject for zstd does not build on CMake < 3.7
+if (ARROW_WITH_ZSTD)
+ add_definitions(-DARROW_WITH_ZSTD)
+endif()
diff --git a/cpp/src/parquet/column_writer-test.cc b/cpp/src/parquet/column_writer-test.cc
index 4416e3d..28a18b1 100644
--- a/cpp/src/parquet/column_writer-test.cc
+++ b/cpp/src/parquet/column_writer-test.cc
@@ -349,11 +349,6 @@ TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithLz4Compression) {
LARGE_SIZE);
}
-TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithZstdCompression) {
- this->TestRequiredWithSettings(Encoding::PLAIN, Compression::ZSTD, false, false,
- LARGE_SIZE);
-}
-
TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithStats) {
this->TestRequiredWithSettings(Encoding::PLAIN, Compression::UNCOMPRESSED, false, true,
LARGE_SIZE);
@@ -379,10 +374,19 @@ TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithStatsAndLz4Compression) {
LARGE_SIZE);
}
+// The ExternalProject for zstd does not build on CMake < 3.7, so we do not
+// require it here
+#ifdef ARROW_WITH_ZSTD
+TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithZstdCompression) {
+ this->TestRequiredWithSettings(Encoding::PLAIN, Compression::ZSTD, false, false,
+ LARGE_SIZE);
+}
+
TYPED_TEST(TestPrimitiveWriter, RequiredPlainWithStatsAndZstdCompression) {
this->TestRequiredWithSettings(Encoding::PLAIN, Compression::ZSTD, false, true,
LARGE_SIZE);
}
+#endif
TYPED_TEST(TestPrimitiveWriter, Optional) {
// Optional and non-repeated, with definition levels
diff --git a/cpp/src/parquet/file-deserialize-test.cc b/cpp/src/parquet/file-deserialize-test.cc
index 17dfe38..f1c1724 100644
--- a/cpp/src/parquet/file-deserialize-test.cc
+++ b/cpp/src/parquet/file-deserialize-test.cc
@@ -176,9 +176,11 @@ TEST_F(TestPageSerde, TestFailLargePageHeaders) {
}
TEST_F(TestPageSerde, Compression) {
- Compression::type codec_types[5] = {Compression::GZIP, Compression::SNAPPY,
- Compression::BROTLI, Compression::LZ4,
- Compression::ZSTD};
+ std::vector<Compression::type> codec_types = {Compression::GZIP, Compression::SNAPPY,
+ Compression::BROTLI, Compression::LZ4};
+#ifdef ARROW_WITH_ZSTD
+ codec_types.push_back(Compression::ZSTD);
+#endif
const int32_t num_rows = 32; // dummy value
data_page_header_.num_values = num_rows;
diff --git a/cpp/src/parquet/file-serialize-test.cc b/cpp/src/parquet/file-serialize-test.cc
index 750faa2..88dd657 100644
--- a/cpp/src/parquet/file-serialize-test.cc
+++ b/cpp/src/parquet/file-serialize-test.cc
@@ -301,9 +301,11 @@ TYPED_TEST(TestSerialize, SmallFileLz4) {
ASSERT_NO_FATAL_FAILURE(this->FileSerializeTest(Compression::LZ4));
}
+#ifdef ARROW_WITH_ZSTD
TYPED_TEST(TestSerialize, SmallFileZstd) {
ASSERT_NO_FATAL_FAILURE(this->FileSerializeTest(Compression::ZSTD));
}
+#endif
} // namespace test