From 817b39f1538202e1183903b8764c4c6965fafeab Mon Sep 17 00:00:00 2001 From: Theo Satabin Date: Tue, 21 Jan 2025 19:11:12 +0100 Subject: [PATCH 1/3] Correction du retour lors du flush S3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### [Fixed] * `S3Context` : on retourne bien false lorsqu'une erreur est rencontrée lors du flush (close_to_write) --- src/storage/S3Context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/S3Context.cpp b/src/storage/S3Context.cpp index 82b93bd8..c994523c 100644 --- a/src/storage/S3Context.cpp +++ b/src/storage/S3Context.cpp @@ -656,7 +656,7 @@ bool S3Context::close_to_write(std::string name) { BOOST_LOG_TRIVIAL(error) << "Unable to flush " << it1->second->size() << " bytes in the S3 object " << bucket_name << "@" << ((cluster_name != "") ? cluster_name : host) << " / " << name << " after " << write_attempts << " tries" ; - return true; + return false; } bool S3Context::exists(std::string name) { From e2370cc52ff1577b037ea6636eebae37ed747caa Mon Sep 17 00:00:00 2001 From: Theo Satabin Date: Mon, 17 Feb 2025 17:33:08 +0100 Subject: [PATCH 2/3] Correction de l'encodage dans TiffDeflateEncoder --- CHANGELOG.md | 6 ++++++ include/rok4/datastream/TiffDeflateEncoder.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ba24f3..4621e474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.0.2 + +### [Fixed] + +* `TiffDeflateEncoder` : l'encodage du résultat final n'est pas en deflate (seule la donnée dans le tiff l'est, et non le résultat complet) + ## 2.0.1 ### [Added] diff --git a/include/rok4/datastream/TiffDeflateEncoder.h b/include/rok4/datastream/TiffDeflateEncoder.h index d6bcf84f..60bfd7b4 100644 --- a/include/rok4/datastream/TiffDeflateEncoder.h +++ b/include/rok4/datastream/TiffDeflateEncoder.h @@ -160,7 +160,7 @@ class TiffDeflateEncoder : public TiffEncoder { } std::string get_encoding() { - return "deflate"; + return ""; } }; From 2adb98c07dfc755cb18caae35abcea2c5978df83 Mon Sep 17 00:00:00 2001 From: Theo Satabin Date: Mon, 17 Feb 2025 17:34:33 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Compl=C3=A9tion=20du=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4621e474..3853c6d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ### [Fixed] * `TiffDeflateEncoder` : l'encodage du résultat final n'est pas en deflate (seule la donnée dans le tiff l'est, et non le résultat complet) +* `S3Context` : on retourne bien false lorsqu'une erreur est rencontrée lors du flush (close_to_write) + ## 2.0.1