commit 4e3b048caa42e9ea331b5cb957779cc48ad97120
author Nina Ilieva <ninai@google.com> Tue Jun 12 13:26:03 2018 -0700
committer Nina Ilieva <ninai@google.com> Fri Jun 15 12:00:34 2018 -0700
tree 3138fa5a70448c6de73d8166f3ca2ab6e14dd85c
parent 182c4f8c894593f925f081299c70ffa579e0812b

Add index label support for reports of type RAW_DUMP

CB-145

Change-Id: Ib1f924739f98ff4c143caf8c4d11027b0854ddba

analyzer/report_master/report_serializer.cc

diff --git a/analyzer/report_master/report_serializer.cc b/analyzer/report_master/report_serializer.cc
index ecfe894..5828366 100644
--- a/analyzer/report_master/report_serializer.cc
+++ b/analyzer/report_master/report_serializer.cc
@@ -125,7 +125,8 @@
   return s;
 }
 
-std::string ValueToString(const ValuePart& value) {
+std::string ValueToString(const ValuePart& value,
+                          const IndexLabels* index_labels = nullptr) {
   switch (value.data_case()) {
     case ValuePart::kStringValue:
       return ToCSVString(value.string_value());
@@ -148,6 +149,14 @@
     }
 
     case ValuePart::kIndexValue: {
+      // Replace the index value with a string if such a string is available.
+      if (index_labels != nullptr) {
+        auto iter = index_labels->labels().find(value.index_value());
+        if (iter != index_labels->labels().end()) {
+          return iter->second;
+        }
+      }
+      // Return <index kIndexValue> if no string mapping is available.
       std::ostringstream stream;
       stream << "<index " << value.index_value() << ">";
       return stream.str();
@@ -664,11 +673,19 @@
   for (const std::string& v : fixed_leftmost_column_values_) {
     (*stream) << v << kSeparator;
   }
-  // TODO(rudominer) Handle labels for indices in RAW_DUMP reports.
-  for (size_t i = 0; i < num_values_this_row - 1; i++) {
-    (*stream) << ValueToString(report_row.values(i)) << kSeparator;
+
+  for (size_t i = 0; i < num_values_this_row; i++) {
+    const IndexLabels* index_labels = nullptr;
+    if (i < (size_t) report_config_->variable_size() &&
+        report_config_->variable(i).has_index_labels()) {
+      index_labels = &(report_config_->variable(i).index_labels());
+    }
+    if (i != 0) {
+      (*stream) << kSeparator;
+    }
+    (*stream) << ValueToString(report_row.values(i), index_labels);
   }
-  (*stream) << ValueToString(report_row.values(num_values_this_row - 1));
+
   AppendCSVSystemProfileFields(report_row.system_profile(), stream);
   (*stream) << std::endl;
   return grpc::Status::OK;