Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overlapping results #805

Merged
merged 4 commits into from
May 22, 2020
Merged

Fix overlapping results #805

merged 4 commits into from
May 22, 2020

Conversation

pawelpasterz
Copy link
Contributor

@pawelpasterz pawelpasterz commented May 20, 2020

This PR will break backward compatibility due to different directory structure for both gcs and local results, but is essential to fix overlapping results bug

Fixes #792

Add matrix level to directory tree structure for gcs . iOS structure remains the same.
Within this change local dir structure will be exactly the same as gcs'.
iOS path should be inlined with android once FTL introduces server side sharding for iOS.

Examples:

Android:

  • gcs -> test-lab-v9cn46bb990nx-kz69ymd4nm9aq/2020-05-21_07-57-00.760000_AIxU/matrix_2/NexusLowRes-28-en-portrait-shard_0
  • local -> results/test-lab-v9cn46bb990nx-kz69ymd4nm9aq/2020-05-21_07-57-00.760000_AIxU/matrix_2/NexusLowRes-28-en-portrait-shard_0

iOS:

  • gcs -> test-lab-v9cn46bb990nx-kz69ymd4nm9aq/2020-05-21_08-38-22.460000_OnCd/shard_0/iphone8-11.2-en_US-portrait/
  • local -> results/test-lab-v9cn46bb990nx-kz69ymd4nm9aq/2020-05-21_08-38-22.460000_OnCd/shard_0/iphone8-11.2-en_US-portrait/

Checklist

  • Unit tested
  • release_notes.md updated

@bootstraponline
Copy link
Contributor

this looks good to me

jan-goral
jan-goral previously approved these changes May 20, 2020
@jan-goral
Copy link
Contributor

Pls update release notes :)

@pawelpasterz
Copy link
Contributor Author

Pls update release notes :)

Sure, it's just draft for the moment :)

@codecov-commenter
Copy link

codecov-commenter commented May 21, 2020

Codecov Report

Merging #805 into master will decrease coverage by 0.11%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #805      +/-   ##
============================================
- Coverage     79.01%   78.90%   -0.12%     
+ Complexity      702      696       -6     
============================================
  Files           138      137       -1     
  Lines          2930     2891      -39     
  Branches        421      417       -4     
============================================
- Hits           2315     2281      -34     
+ Misses          343      342       -1     
+ Partials        272      268       -4     

@pawelpasterz pawelpasterz force-pushed the fix-overlapping-results branch from 08acbb8 to db1cc64 Compare May 21, 2020 10:54
@pawelpasterz pawelpasterz force-pushed the fix-overlapping-results branch from db1cc64 to ae5ba7d Compare May 21, 2020 10:55
@pawelpasterz
Copy link
Contributor Author

@bootstraponline @jan-gogo
Please take a look, I made some changes (please see description)
Thanks!

@pawelpasterz pawelpasterz marked this pull request as ready for review May 21, 2020 11:09
@pawelpasterz pawelpasterz requested a review from jan-goral May 21, 2020 11:16
Copy link
Contributor

@bootstraponline bootstraponline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks awesome!

@pawelpasterz pawelpasterz merged commit f23c7b7 into master May 22, 2020
@pawelpasterz pawelpasterz deleted the fix-overlapping-results branch May 22, 2020 03:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Test results from shards with overlapping names in different matrices are lost
4 participants