PR feedback pitrou #2

apache · Aug 21, 2024 · 2a37491 · 2a37491
1 parent 147f6de
commit 2a37491
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
@@ -1198,9 +1198,10 @@ class ObjectAppendStream final : public io::OutputStream {
     }
 
     // We can upload chunks without copying them into a buffer
-    while (nbytes >= kMaxBlockSizeBytes) {
-      RETURN_NOT_OK(AppendBlock(data_ptr, kMaxBlockSizeBytes));
-      advance_ptr(kMaxBlockSizeBytes);
+    while (nbytes >= kBlockUploadSizeBytes) {
+      const auto upload_size = std::min(nbytes, kMaxBlockSizeBytes);
+      RETURN_NOT_OK(AppendBlock(data_ptr, upload_size));
+      advance_ptr(upload_size);
     }
 
     // Buffer remaining bytes

diff --git a/cpp/src/arrow/filesystem/azurefs_test.cc b/cpp/src/arrow/filesystem/azurefs_test.cc
@@ -39,14 +39,14 @@
 #include <memory>
 #include <random>
 #include <string>
+#include <vector>
 
 #include <gmock/gmock-matchers.h>
 #include <gmock/gmock-more-matchers.h>
 #include <gtest/gtest.h>
 #include <azure/storage/blobs.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 #include <azure/storage/files/datalake.hpp>
-#include <vector>
 
 #include "arrow/filesystem/path_util.h"
 #include "arrow/filesystem/test_util.h"