Address comments

apache · Aug 26, 2024 · 48b9241 · 48b9241
1 parent 52bdce4
commit 48b9241
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/parquet/Cargo.toml b/parquet/Cargo.toml
@@ -68,6 +68,7 @@ twox-hash = { version = "1.6", default-features = false }
 paste = { version = "1.0" }
 half = { version = "2.1", default-features = false, features = ["num-traits"] }
 sysinfo = { version = "0.31.2", optional = true, default-features = false, features = ["system"] }
+crc32fast = { version = "1.4.2", optional = true, default-features = false }
 
 [dev-dependencies]
 base64 = { version = "0.22", default-features = false, features = ["std"] }
@@ -96,7 +97,7 @@ zstd-sys = { version = ">=2.0.0, <2.0.14", default-features = false }
 all-features = true
 
 [features]
-default = ["arrow", "snap", "brotli", "flate2", "lz4", "zstd", "base64", "crc"]
+default = ["arrow", "snap", "brotli", "flate2", "lz4", "zstd", "base64"]
 # Enable lz4
 lz4 = ["lz4_flex"]
 # Enable arrow reader/writer APIs

diff --git a/parquet/src/errors.rs b/parquet/src/errors.rs
@@ -43,7 +43,6 @@ pub enum ParquetError {
     /// Returned when reading into arrow or writing from arrow.
     ArrowError(String),
     IndexOutOfBound(usize, usize),
-    Crc32Mismatch,
     /// An external error variant
     External(Box<dyn Error + Send + Sync>),
 }
@@ -61,9 +60,6 @@ impl std::fmt::Display for ParquetError {
             ParquetError::IndexOutOfBound(index, ref bound) => {
                 write!(fmt, "Index {index} out of bound: {bound}")
             }
-            ParquetError::Crc32Mismatch => {
-                write!(fmt, "Page CRC checksum mismatch")
-            }
             ParquetError::External(e) => write!(fmt, "External: {e}"),
         }
     }

diff --git a/parquet/src/file/serialized_reader.rs b/parquet/src/file/serialized_reader.rs
@@ -396,7 +396,9 @@ pub(crate) fn decode_page(
     if let Some(expected_crc) = page_header.crc {
         let crc = crc32fast::hash(&buffer);
         if crc != expected_crc as u32 {
-            return Err(ParquetError::Crc32Mismatch);
+            return Err(ParquetError::General(
+                "Page CRC checksum mismatch".to_string(),
+            ));
         }
     }