diff --git a/cpp/core/shuffle/LocalPartitionWriter.cc b/cpp/core/shuffle/LocalPartitionWriter.cc
index 8fc24bf8a021..e92ab7719f16 100644
--- a/cpp/core/shuffle/LocalPartitionWriter.cc
+++ b/cpp/core/shuffle/LocalPartitionWriter.cc
@@ -213,7 +213,7 @@ arrow::Status LocalPartitionWriter::init() {
 }
 
 arrow::Status LocalPartitionWriter::mergeSpills(uint32_t partitionId) {
-  for (auto spill : spills_) {
+  for (const auto& spill : spills_) {
     // Read if partition exists in the spilled file and write to the final file.
     if (spill->mergePos < spill->partitionSpillInfos.size() &&
         spill->partitionSpillInfos[spill->mergePos].partitionId == partitionId) { // A hit.
@@ -285,7 +285,6 @@ arrow::Status LocalPartitionWriter::stop(ShuffleWriterMetrics* metrics) {
     }
     partitionLengths_[pid] = endInFinalFile - startInFinalFile;
   }
-  RETURN_NOT_OK(finishEvict());
 
   for (auto spill : spills_) {
     // Check if all spilled data are merged.
diff --git a/cpp/core/shuffle/Utils.cc b/cpp/core/shuffle/Utils.cc
index f959e2a5cdfe..9bef574b27f1 100644
--- a/cpp/core/shuffle/Utils.cc
+++ b/cpp/core/shuffle/Utils.cc
@@ -162,7 +162,7 @@ arrow::Result<std::shared_ptr<arrow::RecordBatch>> makeCompressedRecordBatch(
     int32_t bufferCompressThreshold,
     CompressionMode compressionMode,
     int64_t& compressionTime) {
-  ScopedTimer{compressionTime};
+  ScopedTimer timer{compressionTime};
   std::vector<std::shared_ptr<arrow::Array>> arrays;
   // header col, numRows, compressionType
   {