From be003a1728fe5da09ea08f64d6a2ca658e2db5c0 Mon Sep 17 00:00:00 2001 From: Li Feiyang Date: Wed, 27 Aug 2025 11:11:34 +0800 Subject: [PATCH 1/2] refactor: rename util files from *_utils to *_util for consistency --- src/iceberg/file_format.h | 2 +- src/iceberg/transform_function.cc | 2 +- src/iceberg/util/{string_utils.h => string_util.h} | 0 src/iceberg/util/{truncate_utils.h => truncate_util.h} | 0 test/CMakeLists.txt | 2 +- test/{string_utils_test.cc => string_util_test.cc} | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename src/iceberg/util/{string_utils.h => string_util.h} (100%) rename src/iceberg/util/{truncate_utils.h => truncate_util.h} (100%) rename test/{string_utils_test.cc => string_util_test.cc} (97%) diff --git a/src/iceberg/file_format.h b/src/iceberg/file_format.h index a54f196e6..0919cf0bf 100644 --- a/src/iceberg/file_format.h +++ b/src/iceberg/file_format.h @@ -27,7 +27,7 @@ #include "iceberg/iceberg_export.h" #include "iceberg/result.h" -#include "iceberg/util/string_utils.h" +#include "iceberg/util/string_util.h" namespace iceberg { diff --git a/src/iceberg/transform_function.cc b/src/iceberg/transform_function.cc index 0cc227e50..b043c397c 100644 --- a/src/iceberg/transform_function.cc +++ b/src/iceberg/transform_function.cc @@ -28,7 +28,7 @@ #include "iceberg/expression/literal.h" #include "iceberg/type.h" #include "iceberg/util/murmurhash3_internal.h" -#include "iceberg/util/truncate_utils.h" +#include "iceberg/util/truncate_util.h" namespace iceberg { diff --git a/src/iceberg/util/string_utils.h b/src/iceberg/util/string_util.h similarity index 100% rename from src/iceberg/util/string_utils.h rename to src/iceberg/util/string_util.h diff --git a/src/iceberg/util/truncate_utils.h b/src/iceberg/util/truncate_util.h similarity index 100% rename from src/iceberg/util/truncate_utils.h rename to src/iceberg/util/truncate_util.h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 287d83903..8dbb3df86 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -89,7 +89,7 @@ add_iceberg_test(util_test formatter_test.cc config_test.cc visit_type_test.cc - string_utils_test.cc) + string_util_test.cc) if(ICEBERG_BUILD_BUNDLE) add_iceberg_test(avro_test diff --git a/test/string_utils_test.cc b/test/string_util_test.cc similarity index 97% rename from test/string_utils_test.cc rename to test/string_util_test.cc index 2347debf7..402588114 100644 --- a/test/string_utils_test.cc +++ b/test/string_util_test.cc @@ -17,7 +17,7 @@ * under the License. */ -#include "iceberg/util/string_utils.h" +#include "iceberg/util/string_util.h" #include From 6d191139bef53f89b9607d294648d7b347a551dd Mon Sep 17 00:00:00 2001 From: Li Feiyang Date: Wed, 27 Aug 2025 11:25:41 +0800 Subject: [PATCH 2/2] revert cpp-linter/cpp-linter-action to 2.15.0 to fix CI failures --- .github/workflows/cpp-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml index 1100c6525..8a3d4cca5 100644 --- a/.github/workflows/cpp-linter.yml +++ b/.github/workflows/cpp-linter.yml @@ -39,7 +39,7 @@ jobs: mkdir build && cd build cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON cmake --build . - - uses: cpp-linter/cpp-linter-action@d7155ea6699028b6b09b0457e26b3c5d73f0ed46 + - uses: cpp-linter/cpp-linter-action@f91c446a32ae3eb9f98fef8c9ed4c7cb613a4f8a id: linter continue-on-error: true env: