fix merge conflict

andygrove · Dec 29, 2024 · a21ea6f · a21ea6f
1 parent 63c6428
commit a21ea6f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/native/core/src/execution/shuffle/shuffle_writer.rs b/native/core/src/execution/shuffle/shuffle_writer.rs
@@ -357,7 +357,7 @@ impl PartitionBuffer {
         let mut cursor = Cursor::new(&mut self.frozen);
         cursor.seek(SeekFrom::End(0))?;
         self.shuffle_block_writer
-            .write_batch(&frozen_batch, &mut cursor, ipc_time)?;
+            .write_batch(&frozen_batch, &mut cursor, &metrics.encode_time)?;
 
         mem_diff += (self.frozen.capacity() - frozen_capacity_old) as isize;
         Ok(mem_diff)
@@ -1617,6 +1617,7 @@ impl ShuffleBlockWriter {
 
         // write compression codec used
         match &self.codec {
+            CompressionCodec::Snappy => output.write_all(b"SNAP")?,
             CompressionCodec::Lz4Frame => output.write_all(b"LZ4_")?,
             CompressionCodec::Zstd(_) => output.write_all(b"ZSTD")?,
             CompressionCodec::None => output.write_all(b"NONE")?,
@@ -1682,6 +1683,7 @@ impl ShuffleBlockWriter {
                 fast_writer.write_batch(batch)?;
                 encoder.finish()?
             }
+            _ => unreachable!(),
         };
 
         // fill ipc length