From 3598ac81b0ad9666f98c13414c492243366fc635 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 27 Jun 2017 12:49:40 +0200
Subject: [PATCH 1/2] update scenario result schema

---
 .../performance/scenario_result_schema.json   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tools/run_tests/performance/scenario_result_schema.json b/tools/run_tests/performance/scenario_result_schema.json
index 8ec41c377c5..245861f8c27 100644
--- a/tools/run_tests/performance/scenario_result_schema.json
+++ b/tools/run_tests/performance/scenario_result_schema.json
@@ -107,6 +107,11 @@
         "name": "timeSystem",
         "type": "FLOAT",
         "mode": "NULLABLE"
+      },
+      {
+        "name": "cqPollCount",
+        "type": "INTEGER",
+        "mode": "NULLABLE"
       }
     ]
   },
@@ -129,6 +134,11 @@
         "name": "timeSystem",
         "type": "FLOAT",
         "mode": "NULLABLE"
+      },
+      {
+        "name": "cqPollCount",
+        "type": "INTEGER",
+        "mode": "NULLABLE"
       }
     ]
   },
@@ -196,6 +206,16 @@
         "name": "latency999",
         "type": "FLOAT",
         "mode": "NULLABLE"
+      },
+      {
+        "name": "clientPollsPerRequest",
+        "type": "FLOAT",
+        "mode": "NULLABLE"
+      },
+      {
+        "name": "serverPollsPerRequest",
+        "type": "FLOAT",
+        "mode": "NULLABLE"
       }
     ]
   },

From 58ca8beb165b1a741072ed6ff826c2b87066bc00 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 27 Jun 2017 13:45:46 +0200
Subject: [PATCH 2/2] add script for patching perf benchmark schema

---
 tools/gcp/utils/big_query_utils.py            | 27 +++++++++
 .../patch_scenario_results_schema.py          | 55 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100755 tools/run_tests/performance/patch_scenario_results_schema.py

diff --git a/tools/gcp/utils/big_query_utils.py b/tools/gcp/utils/big_query_utils.py
index 76c86645b76..77a5f5691e9 100755
--- a/tools/gcp/utils/big_query_utils.py
+++ b/tools/gcp/utils/big_query_utils.py
@@ -116,6 +116,33 @@ def create_table2(big_query, project_id, dataset_id, table_id, fields_schema,
   return is_success
 
 
+def patch_table(big_query, project_id, dataset_id, table_id, fields_schema):
+  is_success = True
+
+  body = {
+      'schema': {
+          'fields': fields_schema
+      },
+      'tableReference': {
+          'datasetId': dataset_id,
+          'projectId': project_id,
+          'tableId': table_id
+      }
+  }
+
+  try:
+    table_req = big_query.tables().patch(projectId=project_id,
+                                         datasetId=dataset_id,
+                                         tableId=table_id,
+                                         body=body)
+    res = table_req.execute(num_retries=NUM_RETRIES)
+    print 'Successfully patched %s "%s"' % (res['kind'], res['id'])
+  except HttpError as http_error:
+    print 'Error in creating table: %s. Err: %s' % (table_id, http_error)
+    is_success = False
+  return is_success
+
+
 def insert_rows(big_query, project_id, dataset_id, table_id, rows_list):
   is_success = True
   body = {'rows': rows_list}
diff --git a/tools/run_tests/performance/patch_scenario_results_schema.py b/tools/run_tests/performance/patch_scenario_results_schema.py
new file mode 100755
index 00000000000..81ba5381b3e
--- /dev/null
+++ b/tools/run_tests/performance/patch_scenario_results_schema.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+# Copyright 2016 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Use to patch schema of existing scenario results tables (after adding fields).
+
+from __future__ import print_function
+
+import argparse
+import calendar
+import json
+import os
+import sys
+import time
+import uuid
+
+
+gcp_utils_dir = os.path.abspath(os.path.join(
+    os.path.dirname(__file__), '../../gcp/utils'))
+sys.path.append(gcp_utils_dir)
+import big_query_utils
+
+
+_PROJECT_ID='grpc-testing'
+
+def _patch_results_table(dataset_id, table_id):
+  bq = big_query_utils.create_big_query()
+  with open(os.path.dirname(__file__) + '/scenario_result_schema.json', 'r') as f:
+    table_schema = json.loads(f.read())
+  desc = 'Results of performance benchmarks.'
+  return big_query_utils.patch_table(bq, _PROJECT_ID, dataset_id,
+                                     table_id, table_schema)
+
+
+argp = argparse.ArgumentParser(description='Patch schema of scenario results table.')
+argp.add_argument('--bq_result_table', required=True, default=None, type=str,
+                  help='Bigquery "dataset.table" to patch.')
+
+args = argp.parse_args()
+
+dataset_id, table_id = args.bq_result_table.split('.', 2)
+
+_patch_results_table(dataset_id, table_id)
+print('Successfully patched schema of %s.\n' % args.bq_result_table)