fix comments

Author: xiao.dong

src/iceberg/util/gzip_internal.cc

@@ -39,11 +39,10 @@ class ZlibImpl {
 
   Status Init() {
     // Maximum window size
-    static int WINDOW_BITS = 15;
+    static int kWindowBits = 15;
     // Determine if this is libz or gzip from header.
-    static int DETECT_CODEC = 32;
-
-    int ret = inflateInit2(&stream_, WINDOW_BITS | DETECT_CODEC);
+    static int kDetectCodec = 32;
+    int ret = inflateInit2(&stream_, kWindowBits | kDetectCodec);
     if (ret != Z_OK) {
       return DecompressError("inflateInit2 failed, result:{}", ret);
     }
@@ -82,7 +81,7 @@ class ZlibImpl {
   z_stream stream_;
 };
 
-GZipDecompressor::GZipDecompressor() : zlib_impl_(std::make_shared<ZlibImpl>()) {}
+GZipDecompressor::GZipDecompressor() : zlib_impl_(std::make_unique<ZlibImpl>()) {}
 
 GZipDecompressor::~GZipDecompressor() = default;
 

src/iceberg/util/gzip_internal.h

@@ -39,7 +39,7 @@ class GZipDecompressor {
   Result<std::string> Decompress(const std::string& compressed_data);
 
  private:
-  std::shared_ptr<ZlibImpl> zlib_impl_;
+  std::unique_ptr<ZlibImpl> zlib_impl_;
 };
 
 }  // namespace iceberg

test/metadata_io_test.cc

@@ -44,35 +44,41 @@ class MetadataIOTest : public TempFileTestBase {
     temp_filepath_ = CreateNewTempFilePathWithSuffix(".metadata.json");
   }
 
+  TableMetadata PrepareMetadata() {
+    std::vector<SchemaField> schema_fields;
+    schema_fields.emplace_back(/*field_id=*/1, "x", std::make_shared<LongType>(),
+                               /*optional=*/false);
+    auto schema = std::make_shared<Schema>(std::move(schema_fields), /*schema_id=*/1);
+
+    TableMetadata metadata{
+        .format_version = 1,
+        .table_uuid = "1234567890",
+        .location = "s3://bucket/path",
+        .last_sequence_number = 0,
+        .schemas = {schema},
+        .current_schema_id = 1,
+        .default_spec_id = 0,
+        .last_partition_id = 0,
+        .properties = {{"key", "value"}},
+        .current_snapshot_id = 3051729675574597004,
+        .snapshots = {std::make_shared<Snapshot>(Snapshot{
+            .snapshot_id = 3051729675574597004,
+            .sequence_number = 0,
+            .timestamp_ms = TimePointMsFromUnixMs(1515100955770).value(),
+            .manifest_list = "s3://a/b/1.avro",
+            .summary = {{"operation", "append"}},
+        })},
+        .default_sort_order_id = 0,
+        .next_row_id = 0};
+    return metadata;
+  }
+
   std::shared_ptr<iceberg::FileIO> io_;
   std::string temp_filepath_;
 };
 
 TEST_F(MetadataIOTest, ReadWriteMetadata) {
-  std::vector<SchemaField> schema_fields;
-  schema_fields.emplace_back(/*field_id=*/1, "x", std::make_shared<LongType>(),
-                             /*optional=*/false);
-  auto schema = std::make_shared<Schema>(std::move(schema_fields), /*schema_id=*/1);
-
-  TableMetadata metadata{.format_version = 1,
-                         .table_uuid = "1234567890",
-                         .location = "s3://bucket/path",
-                         .last_sequence_number = 0,
-                         .schemas = {schema},
-                         .current_schema_id = 1,
-                         .default_spec_id = 0,
-                         .last_partition_id = 0,
-                         .properties = {{"key", "value"}},
-                         .current_snapshot_id = 3051729675574597004,
-                         .snapshots = {std::make_shared<Snapshot>(Snapshot{
-                             .snapshot_id = 3051729675574597004,
-                             .sequence_number = 0,
-                             .timestamp_ms = TimePointMsFromUnixMs(1515100955770).value(),
-                             .manifest_list = "s3://a/b/1.avro",
-                             .summary = {{"operation", "append"}},
-                         })},
-                         .default_sort_order_id = 0,
-                         .next_row_id = 0};
+  TableMetadata metadata = PrepareMetadata();
 
   EXPECT_THAT(TableMetadataUtil::Write(*io_, temp_filepath_, metadata), IsOk());
 
@@ -84,30 +90,7 @@ TEST_F(MetadataIOTest, ReadWriteMetadata) {
 }
 
 TEST_F(MetadataIOTest, ReadWriteCompressedMetadata) {
-  std::vector<SchemaField> schema_fields;
-  schema_fields.emplace_back(/*field_id=*/1, "x", std::make_shared<LongType>(),
-                             /*optional=*/false);
-  auto schema = std::make_shared<Schema>(std::move(schema_fields), /*schema_id=*/1);
-
-  TableMetadata metadata{.format_version = 1,
-                         .table_uuid = "1234567890",
-                         .location = "s3://bucket/path",
-                         .last_sequence_number = 0,
-                         .schemas = {schema},
-                         .current_schema_id = 1,
-                         .default_spec_id = 0,
-                         .last_partition_id = 0,
-                         .properties = {{"key", "value"}},
-                         .current_snapshot_id = 3051729675574597004,
-                         .snapshots = {std::make_shared<Snapshot>(Snapshot{
-                             .snapshot_id = 3051729675574597004,
-                             .sequence_number = 0,
-                             .timestamp_ms = TimePointMsFromUnixMs(1515100955770).value(),
-                             .manifest_list = "s3://a/b/1.avro",
-                             .summary = {{"operation", "append"}},
-                         })},
-                         .default_sort_order_id = 0,
-                         .next_row_id = 0};
+  TableMetadata metadata = PrepareMetadata();
 
   auto json = ToJson(metadata);
   auto ret = ToJsonString(json);