Fixes

Author: Sandeep Gottimukkala

src/iceberg/catalog/rest/types.cc

@@ -128,21 +128,38 @@ bool PlanTableScanRequest::operator==(const PlanTableScanRequest& other) const {
 }
 
 bool BaseScanTaskResponse::operator==(const BaseScanTaskResponse& other) const {
-  if (plan_tasks != other.plan_tasks) return false;
-  if (delete_files != other.delete_files) return false;
-  if (file_scan_tasks.size() != other.file_scan_tasks.size()) return false;
+  if (plan_tasks != other.plan_tasks) {
+    return false;
+  }
+  if (delete_files != other.delete_files) {
+    return false;
+  }
+  if (file_scan_tasks.size() != other.file_scan_tasks.size()) {
+    return false;
+  }
   for (size_t i = 0; i < file_scan_tasks.size(); ++i) {
     const auto& a = file_scan_tasks[i];
     const auto& b = other.file_scan_tasks[i];
-    if (!a.data_file() != !b.data_file()) return false;
-    if (a.data_file() && *a.data_file() != *b.data_file()) return false;
-    if (a.delete_files().size() != b.delete_files().size()) return false;
+    if (!a.data_file() != !b.data_file()) {
+      return false;
+    }
+    if (a.data_file() && *a.data_file() != *b.data_file()) {
+      return false;
+    }
+    if (a.delete_files().size() != b.delete_files().size()) {
+      return false;
+    }
     for (size_t j = 0; j < a.delete_files().size(); ++j) {
-      if (!a.delete_files()[j] != !b.delete_files()[j]) return false;
-      if (a.delete_files()[j] && *a.delete_files()[j] != *b.delete_files()[j])
+      if (!a.delete_files()[j] != !b.delete_files()[j]) {
         return false;
+      }
+      if (a.delete_files()[j] && *a.delete_files()[j] != *b.delete_files()[j]) {
+        return false;
+      }
+    }
+    if (a.residual_filter() != b.residual_filter()) {
+      return false;
     }
-    if (a.residual_filter() != b.residual_filter()) return false;
   }
   return true;
 }

src/iceberg/catalog/rest/types.h

@@ -333,7 +333,7 @@ struct ICEBERG_REST_EXPORT BaseScanTaskResponse {
 struct ICEBERG_REST_EXPORT PlanTableScanResponse : BaseScanTaskResponse {
   std::string plan_status;
   std::string plan_id;
-  // TODO: Add credentials.
+  // TODO(sandeepg): Add credentials.
 
   Status Validate() const;
 
@@ -344,7 +344,7 @@ struct ICEBERG_REST_EXPORT PlanTableScanResponse : BaseScanTaskResponse {
 /// available scan tasks.
 struct ICEBERG_REST_EXPORT FetchPlanningResultResponse : BaseScanTaskResponse {
   std::string plan_status;
-  // TODO: Add credentials.
+  // TODO(sandeepg): Add credentials.
 
   Status Validate() const;
 

src/iceberg/json_serde.cc

@@ -1814,7 +1814,9 @@ Result<DataFile> DataFileFromJson(
   // Parse CountMap: {"keys": [int, ...], "values": [long, ...]}
   auto parse_int_map = [&](std::string_view key,
                            std::map<int32_t, int64_t>& target) -> Status {
-    if (!json.contains(key) || json.at(key).is_null()) return {};
+    if (!json.contains(key) || json.at(key).is_null()) {
+      return {};
+    }
     ICEBERG_ASSIGN_OR_RAISE(auto map_json, GetJsonValue<nlohmann::json>(json, key));
     ICEBERG_ASSIGN_OR_RAISE(auto keys,
                             GetTypedJsonValue<std::vector<int32_t>>(map_json.at("keys")));
@@ -1837,7 +1839,9 @@ Result<DataFile> DataFileFromJson(
   // Parse BinaryMap: {"keys": [int, ...], "values": [...]}
   auto parse_binary_map = [&](std::string_view key,
                               std::map<int32_t, std::vector<uint8_t>>& target) -> Status {
-    if (!json.contains(key) || json.at(key).is_null()) return {};
+    if (!json.contains(key) || json.at(key).is_null()) {
+      return {};
+    }
     ICEBERG_ASSIGN_OR_RAISE(auto map_json, GetJsonValue<nlohmann::json>(json, key));
     ICEBERG_ASSIGN_OR_RAISE(auto keys,
                             GetJsonValue<std::vector<int32_t>>(map_json, "keys"));