linter

Author: Innocent

src/iceberg/metrics/commit_report.cc

@@ -24,16 +24,17 @@ namespace iceberg {
 CommitMetrics CommitMetrics::Of(MetricsContext& context) {
   CommitMetrics m;
   m.total_duration = context.GetTimer("totalDuration");
-  m.attempts = context.GetCounter("attempts");
+  m.attempts = context.GetCounter("attempts", CounterUnit::kCount);
   return m;
 }
 
 CommitMetrics CommitMetrics::Noop() { return CommitMetrics::Of(MetricsContext::Null()); }
 
 void CommitMetrics::PopulateResult(CommitMetricsResult& result) const {
-  result.total_duration = total_duration ? TimerResult{total_duration->Count(),
-                                                       total_duration->TotalDuration()}
-                                         : TimerResult{};
+  result.total_duration =
+      total_duration ? TimerResult{.count = total_duration->Count(),
+                                   .total_duration = total_duration->TotalDuration()}
+                     : TimerResult{};
   result.attempts = attempts ? attempts->Value() : 0;
 }
 

src/iceberg/metrics/json_serde.cc

@@ -104,7 +104,7 @@ constexpr std::string_view kProcessedManifestEntriesCount =
 void SetCounterField(nlohmann::json& json, std::string_view key, int64_t value,
                      CounterUnit unit) {
   if (value == 0) return;
-  json[key] = ToJson(CounterResult{unit, value});
+  json[key] = ToJson(CounterResult{.unit = unit, .value = value});
 }
 
 // Helper: parse optional int64 counter field (returns 0 if absent)
@@ -156,7 +156,7 @@ nlohmann::json ToJson(const TimerResult& timer) {
 Result<TimerResult> TimerResultFromJson(const nlohmann::json& json) {
   ICEBERG_ASSIGN_OR_RAISE(auto count, GetJsonValue<int64_t>(json, kCount));
   ICEBERG_ASSIGN_OR_RAISE(auto total, GetJsonValue<int64_t>(json, kTotalDuration));
-  return TimerResult{count, std::chrono::nanoseconds{total}};
+  return TimerResult{.count = count, .total_duration = std::chrono::nanoseconds{total}};
 }
 
 // ---------------------------------------------------------------------------

src/iceberg/metrics/metrics_context.h

@@ -45,7 +45,7 @@ class ICEBERG_EXPORT MetricsContext {
 
   /// \brief Get or create a named Counter.
   virtual std::shared_ptr<Counter> GetCounter(std::string_view name,
-                                              CounterUnit unit = CounterUnit::kCount) = 0;
+                                              CounterUnit unit) = 0;
 
   /// \brief Get or create a named Timer (nanosecond precision).
   virtual std::shared_ptr<Timer> GetTimer(std::string_view name) = 0;
@@ -66,8 +66,7 @@ class ICEBERG_EXPORT MetricsContext {
 /// during single-threaded setup).
 class ICEBERG_EXPORT DefaultMetricsContext : public MetricsContext {
  public:
-  std::shared_ptr<Counter> GetCounter(std::string_view name,
-                                      CounterUnit unit = CounterUnit::kCount) override;
+  std::shared_ptr<Counter> GetCounter(std::string_view name, CounterUnit unit) override;
 
   std::shared_ptr<Timer> GetTimer(std::string_view name) override;
 

src/iceberg/metrics/scan_report.cc

@@ -24,35 +24,43 @@ namespace iceberg {
 ScanMetrics ScanMetrics::Of(MetricsContext& context) {
   ScanMetrics m;
   m.total_planning_duration = context.GetTimer("totalPlanningDuration");
-  m.result_data_files = context.GetCounter("resultDataFiles");
-  m.result_delete_files = context.GetCounter("resultDeleteFiles");
-  m.scanned_data_manifests = context.GetCounter("scannedDataManifests");
-  m.scanned_delete_manifests = context.GetCounter("scannedDeleteManifests");
-  m.total_data_manifests = context.GetCounter("totalDataManifests");
-  m.total_delete_manifests = context.GetCounter("totalDeleteManifests");
+  m.result_data_files = context.GetCounter("resultDataFiles", CounterUnit::kCount);
+  m.result_delete_files = context.GetCounter("resultDeleteFiles", CounterUnit::kCount);
+  m.scanned_data_manifests =
+      context.GetCounter("scannedDataManifests", CounterUnit::kCount);
+  m.scanned_delete_manifests =
+      context.GetCounter("scannedDeleteManifests", CounterUnit::kCount);
+  m.total_data_manifests = context.GetCounter("totalDataManifests", CounterUnit::kCount);
+  m.total_delete_manifests =
+      context.GetCounter("totalDeleteManifests", CounterUnit::kCount);
   m.total_file_size_in_bytes =
       context.GetCounter("totalFileSizeInBytes", CounterUnit::kBytes);
   m.total_delete_file_size_in_bytes =
       context.GetCounter("totalDeleteFileSizeInBytes", CounterUnit::kBytes);
-  m.skipped_data_manifests = context.GetCounter("skippedDataManifests");
-  m.skipped_delete_manifests = context.GetCounter("skippedDeleteManifests");
-  m.skipped_data_files = context.GetCounter("skippedDataFiles");
-  m.skipped_delete_files = context.GetCounter("skippedDeleteFiles");
-  m.indexed_delete_files = context.GetCounter("indexedDeleteFiles");
-  m.equality_delete_files = context.GetCounter("equalityDeleteFiles");
-  m.positional_delete_files = context.GetCounter("positionalDeleteFiles");
-  m.dvs = context.GetCounter("dvs");
+  m.skipped_data_manifests =
+      context.GetCounter("skippedDataManifests", CounterUnit::kCount);
+  m.skipped_delete_manifests =
+      context.GetCounter("skippedDeleteManifests", CounterUnit::kCount);
+  m.skipped_data_files = context.GetCounter("skippedDataFiles", CounterUnit::kCount);
+  m.skipped_delete_files = context.GetCounter("skippedDeleteFiles", CounterUnit::kCount);
+  m.indexed_delete_files = context.GetCounter("indexedDeleteFiles", CounterUnit::kCount);
+  m.equality_delete_files =
+      context.GetCounter("equalityDeleteFiles", CounterUnit::kCount);
+  m.positional_delete_files =
+      context.GetCounter("positionalDeleteFiles", CounterUnit::kCount);
+  m.dvs = context.GetCounter("dvs", CounterUnit::kCount);
   return m;
 }
 
 ScanMetrics ScanMetrics::Noop() { return ScanMetrics::Of(MetricsContext::Null()); }
 
 ScanMetricsResult ScanMetrics::ToResult() const {
   ScanMetricsResult r;
-  r.total_planning_duration = total_planning_duration
-                                  ? TimerResult{total_planning_duration->Count(),
-                                                total_planning_duration->TotalDuration()}
-                                  : TimerResult{};
+  r.total_planning_duration =
+      total_planning_duration
+          ? TimerResult{.count = total_planning_duration->Count(),
+                        .total_duration = total_planning_duration->TotalDuration()}
+          : TimerResult{};
   r.result_data_files = result_data_files ? result_data_files->Value() : 0;
   r.result_delete_files = result_delete_files ? result_delete_files->Value() : 0;
   r.scanned_data_manifests = scanned_data_manifests ? scanned_data_manifests->Value() : 0;

src/iceberg/test/metrics_test.cc

@@ -238,7 +238,7 @@ TEST(CommitMetricsTest, TimerAndAttemptsPopulated) {
 // ---------------------------------------------------------------------------
 
 TEST(CounterResultSerdeTest, RoundTrip) {
-  CounterResult original{CounterUnit::kBytes, 1024};
+  CounterResult original{.unit = CounterUnit::kBytes, .value = 1024};
   auto json = ToJson(original);
   auto result = CounterResultFromJson(json);
   ASSERT_TRUE(result.has_value());
@@ -247,7 +247,7 @@ TEST(CounterResultSerdeTest, RoundTrip) {
 }
 
 TEST(TimerResultSerdeTest, RoundTrip) {
-  TimerResult original{3, std::chrono::nanoseconds{9876}};
+  TimerResult original{.count = 3, .total_duration = std::chrono::nanoseconds{9876}};
   auto json = ToJson(original);
   auto result = TimerResultFromJson(json);
   ASSERT_TRUE(result.has_value());
@@ -267,7 +267,7 @@ TEST(ScanReportSerdeTest, RoundTrip) {
   report.scan_metrics.result_data_files = 7;
   report.scan_metrics.total_file_size_in_bytes = 8192;
   report.scan_metrics.total_planning_duration =
-      TimerResult{1, std::chrono::nanoseconds{100000}};
+      TimerResult{.count = 1, .total_duration = std::chrono::nanoseconds{100000}};
   report.projected_field_ids = {1, 2};
   report.projected_field_names = {"id", "name"};
 
@@ -317,7 +317,8 @@ TEST(CommitReportSerdeTest, RoundTrip) {
   report.snapshot_id = 99;
   report.sequence_number = 5;
   report.operation = "append";
-  report.commit_metrics.total_duration = TimerResult{1, std::chrono::nanoseconds{200000}};
+  report.commit_metrics.total_duration =
+      TimerResult{.count = 1, .total_duration = std::chrono::nanoseconds{200000}};
   report.commit_metrics.attempts = 1;
   report.commit_metrics.added_data_files = 3;
   report.commit_metrics.added_records = 1000;