<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260837] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/260837">260837</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2020-04-28 12:02:53 -0700 (Tue, 28 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>results.webkit.org: A suite running multiple times in a commit for a single configuration may overwrite upload metadata
https://bugs.webkit.org/show_bug.cgi?id=211097
<rdar://problem/62474538>

Rubber-stamped by Aakash Jain.

Create a new table for uploads which is indexed by both uuid and timestamp so that uploads which share
a configuration and uuid but not a timestamp do not collide.

* resultsdbpy/resultsdbpy/model/upload_context.py:
(UploadContext):
(UploadContext.UploadsByConfigurationLegacy): Renamed from UploadContext.UploadsByConfiguration.
(UploadContext.UploadsByConfiguration): New database table indexed by both timestamp and uuid.
(UploadContext.UploadsByConfiguration.unpack):
(UploadContext.__init__):
(UploadContext.find_test_results): Search both versions of the UploadsByConfiguration table.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsresultsdbpyresultsdbpymodelupload_contextpy">trunk/Tools/resultsdbpy/resultsdbpy/model/upload_context.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260836 => 260837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-28 18:59:13 UTC (rev 260836)
+++ trunk/Tools/ChangeLog       2020-04-28 19:02:53 UTC (rev 260837)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2020-04-28  Jonathan Bedard  <jbedard@apple.com>
+
+        results.webkit.org: A suite running multiple times in a commit for a single configuration may overwrite upload metadata
+        https://bugs.webkit.org/show_bug.cgi?id=211097
+        <rdar://problem/62474538>
+
+        Rubber-stamped by Aakash Jain.
+
+        Create a new table for uploads which is indexed by both uuid and timestamp so that uploads which share
+        a configuration and uuid but not a timestamp do not collide.
+
+        * resultsdbpy/resultsdbpy/model/upload_context.py:
+        (UploadContext):
+        (UploadContext.UploadsByConfigurationLegacy): Renamed from UploadContext.UploadsByConfiguration.
+        (UploadContext.UploadsByConfiguration): New database table indexed by both timestamp and uuid.
+        (UploadContext.UploadsByConfiguration.unpack):
+        (UploadContext.__init__):
+        (UploadContext.find_test_results): Search both versions of the UploadsByConfiguration table.
+
</ins><span class="cx"> 2020-04-28  Claudio Saavedra  <csaavedra@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [Linux] Replace --geometry with --fullscreen when using MiniBrowser for WebDriver tests
</span></span></pre></div>
<a id="trunkToolsresultsdbpyresultsdbpymodelupload_contextpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/resultsdbpy/resultsdbpy/model/upload_context.py (260836 => 260837)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/resultsdbpy/resultsdbpy/model/upload_context.py      2020-04-28 18:59:13 UTC (rev 260836)
+++ trunk/Tools/resultsdbpy/resultsdbpy/model/upload_context.py 2020-04-28 19:02:53 UTC (rev 260837)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx">         suite = columns.Text(primary_key=True, required=True)
</span><span class="cx">         branch = columns.Text(primary_key=True, required=True)
</span><span class="cx"> 
</span><del>-    class UploadsByConfiguration(ClusteredByConfiguration):
</del><ins>+    # FIXME: Remove the UploadsByConfigurationLegacy once results in it are sufficently old in Spring 2021
+    class UploadsByConfigurationLegacy(ClusteredByConfiguration):
</ins><span class="cx">         __table_name__ = 'uploads_by_configuration_01'
</span><span class="cx">         suite = columns.Text(partition_key=True, required=True)
</span><span class="cx">         branch = columns.Text(partition_key=True, required=True)
</span><span class="lines">@@ -67,6 +68,26 @@
</span><span class="cx">                 version=self.upload_version,
</span><span class="cx">             )
</span><span class="cx"> 
</span><ins>+    class UploadsByConfiguration(ClusteredByConfiguration):
+        __table_name__ = 'uploads_by_configuration_02'
+        suite = columns.Text(partition_key=True, required=True)
+        branch = columns.Text(partition_key=True, required=True)
+        uuid = columns.BigInt(primary_key=True, required=True, clustering_order='DESC')
+        time_uploaded = columns.DateTime(primary_key=True, required=True)
+        sdk = columns.Text(primary_key=True, required=True)
+        commits = columns.Blob(required=True)
+        test_results = columns.Blob(required=True)
+        upload_version = columns.Integer(required=True)
+
+        def unpack(self):
+            return dict(
+                commits=[Commit.from_json(element) for element in json.loads(UploadContext.from_zip(bytearray(self.commits)))],
+                sdk=None if self.sdk == '?' else self.sdk,
+                test_results=json.loads(UploadContext.from_zip(bytearray(self.test_results))),
+                timestamp=calendar.timegm(self.time_uploaded.timetuple()),
+                version=self.upload_version,
+            )
+
</ins><span class="cx">     def __init__(self, configuration_context, commit_context, ttl_seconds=None, async_processing=False):
</span><span class="cx">         self.ttl_seconds = ttl_seconds
</span><span class="cx">         self.configuration_context = configuration_context
</span><span class="lines">@@ -75,6 +96,7 @@
</span><span class="cx">         self._process_upload_callbacks = defaultdict(dict)
</span><span class="cx">         with self:
</span><span class="cx">             self.cassandra.create_table(self.SuitesByConfiguration)
</span><ins>+            self.cassandra.create_table(self.UploadsByConfigurationLegacy)
</ins><span class="cx">             self.cassandra.create_table(self.UploadsByConfiguration)
</span><span class="cx"> 
</span><span class="cx">         self._async_processing = async_processing
</span><span class="lines">@@ -252,7 +274,16 @@
</span><span class="cx">         with self:
</span><span class="cx">             result = {}
</span><span class="cx">             for configuration in configurations:
</span><ins>+                # FIXME: Remove the UploadsByConfigurationLegacy once results in it are sufficently old in Spring 2021
+                # We don't need to ignore duplicates because we never reported to both databases
</ins><span class="cx">                 result.update({config: [value.unpack() for value in values] for config, values in self.configuration_context.select_from_table_with_configurations(
</span><ins>+                    self.UploadsByConfigurationLegacy.__table_name__, configurations=[configuration], recent=recent,
+                    suite=suite, sdk=configuration.sdk, branch=branch or self.commit_context.DEFAULT_BRANCH_KEY,
+                    uuid__gte=CommitContext.convert_to_uuid(begin),
+                    uuid__lte=CommitContext.convert_to_uuid(end, CommitContext.timestamp_to_uuid()), limit=limit,
+                ).items()})
+
+                result.update({config: [value.unpack() for value in values] for config, values in self.configuration_context.select_from_table_with_configurations(
</ins><span class="cx">                     self.UploadsByConfiguration.__table_name__, configurations=[configuration], recent=recent,
</span><span class="cx">                     suite=suite, sdk=configuration.sdk, branch=branch or self.commit_context.DEFAULT_BRANCH_KEY,
</span><span class="cx">                     uuid__gte=CommitContext.convert_to_uuid(begin),
</span></span></pre>
</div>
</div>

</body>
</html>