From b769cd5c9a23088a92053e7b5e01261168a9812d Mon Sep 17 00:00:00 2001
From: Vinnie Magro <vmagro@fb.com>
Date: Wed, 25 Aug 2021 11:07:48 -0700
Subject: [PATCH 01/10] antlir oss: add mysql_async as dep of test runner

Summary: Needed for the new test state tracker tool the MLH Fellow is working on

Differential Revision: D30546653

fbshipit-source-id: 1a983c671532000dc7a6a30b17080bdb6ff91e0c
---
 third-party/rust/BUCK                    | 1931 +++++++++++++++++++++-
 tools/testinfra/runner/{BUCK => TARGETS} |    1 +
 2 files changed, 1903 insertions(+), 29 deletions(-)
 rename tools/testinfra/runner/{BUCK => TARGETS} (93%)

diff --git a/third-party/rust/BUCK b/third-party/rust/BUCK
index 170d8dfb86..526e157304 100644
--- a/third-party/rust/BUCK
+++ b/third-party/rust/BUCK
@@ -34,7 +34,7 @@ rust_library(
         "-Aunused_braces",
         "-Wbare_trait_objects",
         "-Wellipsis_inclusive_range_patterns",
-        "-Dnon_fmt_panic",
+        "-Dnon_fmt_panics",
         "-Dunconditional_recursion",
     ],
     unittests = False,
@@ -196,6 +196,12 @@ archive(
     url = "https://static.crates.io/crates/adler/adler-0.2.3.crate",
 )
 
+archive(
+    name = "adler32-1.2.0--archive",
+    sha256 = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234",
+    url = "https://static.crates.io/crates/adler32/adler32-1.2.0.crate",
+)
+
 archive(
     name = "ahash-0.7.4--archive",
     sha256 = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98",
@@ -232,6 +238,12 @@ archive(
     url = "https://static.crates.io/crates/argv/argv-0.1.2.crate",
 )
 
+archive(
+    name = "arrayvec-0.5.2--archive",
+    sha256 = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b",
+    url = "https://static.crates.io/crates/arrayvec/arrayvec-0.5.2.crate",
+)
+
 archive(
     name = "ascii-canvas-2.0.0--archive",
     sha256 = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29",
@@ -292,6 +304,12 @@ archive(
     url = "https://static.crates.io/crates/beef/beef-0.4.4.crate",
 )
 
+archive(
+    name = "bigdecimal-0.1.2--archive",
+    sha256 = "1374191e2dd25f9ae02e3aa95041ed5d747fc77b3c102b49fe2dd9a8117a6244",
+    url = "https://static.crates.io/crates/bigdecimal/bigdecimal-0.1.2.crate",
+)
+
 archive(
     name = "bit-set-0.5.2--archive",
     sha256 = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de",
@@ -358,6 +376,12 @@ archive(
     url = "https://static.crates.io/crates/byteorder/byteorder-1.3.4.crate",
 )
 
+archive(
+    name = "bytes-0.4.12--archive",
+    sha256 = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c",
+    url = "https://static.crates.io/crates/bytes/bytes-0.4.12.crate",
+)
+
 archive(
     name = "bytes-0.5.6--archive",
     sha256 = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38",
@@ -418,6 +442,18 @@ archive(
     url = "https://static.crates.io/crates/cpuid-bool/cpuid-bool-0.1.2.crate",
 )
 
+archive(
+    name = "crc32fast-1.2.0--archive",
+    sha256 = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1",
+    url = "https://static.crates.io/crates/crc32fast/crc32fast-1.2.0.crate",
+)
+
+archive(
+    name = "crossbeam-0.7.3--archive",
+    sha256 = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e",
+    url = "https://static.crates.io/crates/crossbeam/crossbeam-0.7.3.crate",
+)
+
 archive(
     name = "crossbeam-channel-0.4.4--archive",
     sha256 = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87",
@@ -430,18 +466,36 @@ archive(
     url = "https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.0.crate",
 )
 
+archive(
+    name = "crossbeam-deque-0.7.3--archive",
+    sha256 = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285",
+    url = "https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.7.3.crate",
+)
+
 archive(
     name = "crossbeam-deque-0.8.0--archive",
     sha256 = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9",
     url = "https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.0.crate",
 )
 
+archive(
+    name = "crossbeam-epoch-0.8.2--archive",
+    sha256 = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace",
+    url = "https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.8.2.crate",
+)
+
 archive(
     name = "crossbeam-epoch-0.9.1--archive",
     sha256 = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d",
     url = "https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.1.crate",
 )
 
+archive(
+    name = "crossbeam-queue-0.2.3--archive",
+    sha256 = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570",
+    url = "https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.2.3.crate",
+)
+
 archive(
     name = "crossbeam-utils-0.7.2--archive",
     sha256 = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8",
@@ -640,12 +694,30 @@ archive(
     url = "https://static.crates.io/crates/fixedbitset/fixedbitset-0.2.0.crate",
 )
 
+archive(
+    name = "flate2-1.0.14--archive",
+    sha256 = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42",
+    url = "https://static.crates.io/crates/flate2/flate2-1.0.14.crate",
+)
+
 archive(
     name = "fnv-1.0.7--archive",
     sha256 = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
     url = "https://static.crates.io/crates/fnv/fnv-1.0.7.crate",
 )
 
+archive(
+    name = "foreign-types-0.3.2--archive",
+    sha256 = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1",
+    url = "https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate",
+)
+
+archive(
+    name = "foreign-types-shared-0.1.1--archive",
+    sha256 = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b",
+    url = "https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate",
+)
+
 archive(
     name = "form_urlencoded-1.0.0--archive",
     sha256 = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00",
@@ -922,6 +994,18 @@ archive(
     url = "https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate",
 )
 
+archive(
+    name = "lexical-5.2.0--archive",
+    sha256 = "a28ff8a57641758c89a37b2d28556a68978b3ea3f709f39953e153acea3dbacf",
+    url = "https://static.crates.io/crates/lexical/lexical-5.2.0.crate",
+)
+
+archive(
+    name = "lexical-core-0.7.6--archive",
+    sha256 = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe",
+    url = "https://static.crates.io/crates/lexical-core/lexical-core-0.7.6.crate",
+)
+
 archive(
     name = "libc-0.2.98--archive",
     sha256 = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790",
@@ -934,6 +1018,12 @@ archive(
     url = "https://static.crates.io/crates/libm/libm-0.2.1.crate",
 )
 
+archive(
+    name = "libz-sys-1.1.2--archive",
+    sha256 = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655",
+    url = "https://static.crates.io/crates/libz-sys/libz-sys-1.1.2.crate",
+)
+
 archive(
     name = "link-cplusplus-1.0.3--archive",
     sha256 = "372d61b8ffdc79aa85d5f679e16c9e34da2357796186e877001f21998ece1f99",
@@ -1006,6 +1096,12 @@ archive(
     url = "https://static.crates.io/crates/memchr/memchr-2.4.1.crate",
 )
 
+archive(
+    name = "memoffset-0.5.6--archive",
+    sha256 = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa",
+    url = "https://static.crates.io/crates/memoffset/memoffset-0.5.6.crate",
+)
+
 archive(
     name = "memoffset-0.6.4--archive",
     sha256 = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9",
@@ -1024,6 +1120,12 @@ archive(
     url = "https://static.crates.io/crates/mime_guess/mime_guess-2.0.3.crate",
 )
 
+archive(
+    name = "miniz_oxide-0.3.7--archive",
+    sha256 = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435",
+    url = "https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.3.7.crate",
+)
+
 archive(
     name = "miniz_oxide-0.4.2--archive",
     sha256 = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9",
@@ -1042,6 +1144,12 @@ archive(
     url = "https://static.crates.io/crates/mio/mio-0.7.7.crate",
 )
 
+archive(
+    name = "mio-named-pipes-0.1.7--archive",
+    sha256 = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656",
+    url = "https://static.crates.io/crates/mio-named-pipes/mio-named-pipes-0.1.7.crate",
+)
+
 archive(
     name = "mio-uds-0.6.8--archive",
     sha256 = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0",
@@ -1054,6 +1162,24 @@ archive(
     url = "https://static.crates.io/crates/multipart/multipart-0.17.0.crate",
 )
 
+archive(
+    name = "mysql_async-0.23.1--archive",
+    sha256 = "2437d3b8ce11d743be7adfbdc5092f6046141b78677b1e3bc9e914d3d1a4c744",
+    url = "https://static.crates.io/crates/mysql_async/mysql_async-0.23.1.crate",
+)
+
+archive(
+    name = "mysql_common-0.22.2--archive",
+    sha256 = "c529a525c62e4788cff3a4557b652e2efd04eb3171da4ae2792031499f96442f",
+    url = "https://static.crates.io/crates/mysql_common/mysql_common-0.22.2.crate",
+)
+
+archive(
+    name = "native-tls-0.2.4--archive",
+    sha256 = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d",
+    url = "https://static.crates.io/crates/native-tls/native-tls-0.2.4.crate",
+)
+
 archive(
     name = "net2-0.2.37--archive",
     sha256 = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae",
@@ -1078,6 +1204,12 @@ archive(
     url = "https://static.crates.io/crates/nix/nix-0.20.0.crate",
 )
 
+archive(
+    name = "num-bigint-0.2.6--archive",
+    sha256 = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304",
+    url = "https://static.crates.io/crates/num-bigint/num-bigint-0.2.6.crate",
+)
+
 archive(
     name = "num-derive-0.3.2--archive",
     sha256 = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3",
@@ -1126,12 +1258,24 @@ archive(
     url = "https://static.crates.io/crates/opaque-debug/opaque-debug-0.3.0.crate",
 )
 
+archive(
+    name = "openssl-0.10.35--archive",
+    sha256 = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885",
+    url = "https://static.crates.io/crates/openssl/openssl-0.10.35.crate",
+)
+
 archive(
     name = "openssl-probe-0.1.2--archive",
     sha256 = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de",
     url = "https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.2.crate",
 )
 
+archive(
+    name = "openssl-sys-0.9.65--archive",
+    sha256 = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d",
+    url = "https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.65.crate",
+)
+
 archive(
     name = "ordered-float-1.1.1--archive",
     sha256 = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7",
@@ -1468,6 +1612,12 @@ archive(
     url = "https://static.crates.io/crates/ring/ring-0.16.20.crate",
 )
 
+archive(
+    name = "rust_decimal-1.8.1--archive",
+    sha256 = "c9e81662973c7a8d9663e64a0de4cd642b89a21d64966e3d99606efdc5fb0cc6",
+    url = "https://static.crates.io/crates/rust_decimal/rust_decimal-1.8.1.crate",
+)
+
 archive(
     name = "rustc-demangle-0.1.20--archive",
     sha256 = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49",
@@ -1576,6 +1726,12 @@ archive(
     url = "https://static.crates.io/crates/sha-1/sha-1-0.9.4.crate",
 )
 
+archive(
+    name = "sha1-0.6.0--archive",
+    sha256 = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d",
+    url = "https://static.crates.io/crates/sha1/sha1-0.6.0.crate",
+)
+
 archive(
     name = "sha2-0.8.2--archive",
     sha256 = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69",
@@ -1642,6 +1798,12 @@ archive(
     url = "https://static.crates.io/crates/stable_deref_trait/stable_deref_trait-1.2.0.crate",
 )
 
+archive(
+    name = "standback-0.2.10--archive",
+    sha256 = "33a71ea1ea5f8747d1af1979bfb7e65c3a025a70609f04ceb78425bc5adad8e6",
+    url = "https://static.crates.io/crates/standback/standback-0.2.10.crate",
+)
+
 archive(
     name = "static_assertions-1.1.0--archive",
     sha256 = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f",
@@ -1685,9 +1847,9 @@ archive(
 )
 
 archive(
-    name = "synstructure-0.12.4--archive",
-    sha256 = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701",
-    url = "https://static.crates.io/crates/synstructure/synstructure-0.12.4.crate",
+    name = "synstructure-0.12.5--archive",
+    sha256 = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa",
+    url = "https://static.crates.io/crates/synstructure/synstructure-0.12.5.crate",
 )
 
 archive(
@@ -1762,6 +1924,24 @@ archive(
     url = "https://static.crates.io/crates/time/time-0.1.44.crate",
 )
 
+archive(
+    name = "time-0.2.22--archive",
+    sha256 = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af",
+    url = "https://static.crates.io/crates/time/time-0.2.22.crate",
+)
+
+archive(
+    name = "time-macros-0.1.1--archive",
+    sha256 = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1",
+    url = "https://static.crates.io/crates/time-macros/time-macros-0.1.1.crate",
+)
+
+archive(
+    name = "time-macros-impl-0.1.1--archive",
+    sha256 = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa",
+    url = "https://static.crates.io/crates/time-macros-impl/time-macros-impl-0.1.1.crate",
+)
+
 archive(
     name = "tinyvec-0.3.4--archive",
     sha256 = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117",
@@ -1780,6 +1960,12 @@ archive(
     url = "https://static.crates.io/crates/tokio/tokio-1.7.1.crate",
 )
 
+archive(
+    name = "tokio-io-0.1.13--archive",
+    sha256 = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674",
+    url = "https://static.crates.io/crates/tokio-io/tokio-io-0.1.13.crate",
+)
+
 archive(
     name = "tokio-macros-0.2.6--archive",
     sha256 = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a",
@@ -1804,12 +1990,24 @@ archive(
     url = "https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.4.crate",
 )
 
+archive(
+    name = "tokio-tls-0.3.1--archive",
+    sha256 = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343",
+    url = "https://static.crates.io/crates/tokio-tls/tokio-tls-0.3.1.crate",
+)
+
 archive(
     name = "tokio-tungstenite-0.13.0--archive",
     sha256 = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b",
     url = "https://static.crates.io/crates/tokio-tungstenite/tokio-tungstenite-0.13.0.crate",
 )
 
+archive(
+    name = "tokio-util-0.2.0--archive",
+    sha256 = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930",
+    url = "https://static.crates.io/crates/tokio-util/tokio-util-0.2.0.crate",
+)
+
 archive(
     name = "tokio-util-0.6.3--archive",
     sha256 = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b",
@@ -1894,6 +2092,12 @@ archive(
     url = "https://static.crates.io/crates/twoway/twoway-0.1.8.crate",
 )
 
+archive(
+    name = "twox-hash-1.5.0--archive",
+    sha256 = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56",
+    url = "https://static.crates.io/crates/twox-hash/twox-hash-1.5.0.crate",
+)
+
 archive(
     name = "typenum-1.12.0--archive",
     sha256 = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33",
@@ -1949,9 +2153,9 @@ archive(
 )
 
 archive(
-    name = "url-2.2.0--archive",
-    sha256 = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e",
-    url = "https://static.crates.io/crates/url/url-2.2.0.crate",
+    name = "url-2.2.2--archive",
+    sha256 = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c",
+    url = "https://static.crates.io/crates/url/url-2.2.2.crate",
 )
 
 archive(
@@ -1972,6 +2176,12 @@ archive(
     url = "https://static.crates.io/crates/utf8parse/utf8parse-0.2.0.crate",
 )
 
+archive(
+    name = "uuid-0.8.1--archive",
+    sha256 = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11",
+    url = "https://static.crates.io/crates/uuid/uuid-0.8.1.crate",
+)
+
 archive(
     name = "vec_map-0.8.2--archive",
     sha256 = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191",
@@ -2070,6 +2280,28 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "adler32-1.2.0",
+    srcs = ["adler32-1.2.0/src/lib.rs"],
+    archive = ":adler32-1.2.0--archive",
+    crate = "adler32",
+    crate_root = "adler32-1.2.0/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "ahash",
     srcs = [
@@ -2264,6 +2496,36 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "arrayvec",
+    srcs = [
+        "arrayvec-0.5.2/src/array.rs",
+        "arrayvec-0.5.2/src/array_string.rs",
+        "arrayvec-0.5.2/src/char.rs",
+        "arrayvec-0.5.2/src/errors.rs",
+        "arrayvec-0.5.2/src/lib.rs",
+        "arrayvec-0.5.2/src/maybe_uninit.rs",
+    ],
+    archive = ":arrayvec-0.5.2--archive",
+    crate = "arrayvec",
+    crate_root = "arrayvec-0.5.2/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "array-sizes-33-128",
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "ascii-canvas-2.0.0",
     srcs = [
@@ -2599,6 +2861,33 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "bigdecimal-0.1.2",
+    srcs = [
+        "bigdecimal-0.1.2/src/lib.rs",
+        "bigdecimal-0.1.2/src/macros.rs",
+    ],
+    archive = ":bigdecimal-0.1.2--archive",
+    crate = "bigdecimal",
+    crate_root = "bigdecimal-0.1.2/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = ["serde"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":num-bigint-0.2.6",
+        ":num-integer-0.1.44",
+        ":num-traits",
+        ":serde",
+    ],
+)
+
 third_party_rust_library(
     name = "bit-set",
     srcs = ["bit-set-0.5.2/src/lib.rs"],
@@ -2998,6 +3287,50 @@ third_party_rust_library(
     deps = [":serde"],
 )
 
+third_party_rust_library(
+    name = "bytes-old",
+    srcs = [
+        "bytes-0.4.12/src/buf/buf.rs",
+        "bytes-0.4.12/src/buf/buf_mut.rs",
+        "bytes-0.4.12/src/buf/chain.rs",
+        "bytes-0.4.12/src/buf/from_buf.rs",
+        "bytes-0.4.12/src/buf/into_buf.rs",
+        "bytes-0.4.12/src/buf/iter.rs",
+        "bytes-0.4.12/src/buf/mod.rs",
+        "bytes-0.4.12/src/buf/reader.rs",
+        "bytes-0.4.12/src/buf/take.rs",
+        "bytes-0.4.12/src/buf/vec_deque.rs",
+        "bytes-0.4.12/src/buf/writer.rs",
+        "bytes-0.4.12/src/bytes.rs",
+        "bytes-0.4.12/src/debug.rs",
+        "bytes-0.4.12/src/either.rs",
+        "bytes-0.4.12/src/lib.rs",
+        "bytes-0.4.12/src/serde.rs",
+    ],
+    archive = ":bytes-0.4.12--archive",
+    crate = "bytes",
+    crate_root = "bytes-0.4.12/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "either",
+        "serde",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":byteorder",
+        ":either",
+        ":iovec-0.1.4",
+        ":serde",
+    ],
+)
+
 third_party_rust_library(
     name = "cfg-if",
     srcs = ["cfg-if-0.1.10/src/lib.rs"],
@@ -3291,6 +3624,103 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "crc32fast-1.2.0",
+    srcs = [
+        "crc32fast-1.2.0/src/baseline.rs",
+        "crc32fast-1.2.0/src/combine.rs",
+        "crc32fast-1.2.0/src/lib.rs",
+        "crc32fast-1.2.0/src/specialized/aarch64.rs",
+        "crc32fast-1.2.0/src/specialized/mod.rs",
+        "crc32fast-1.2.0/src/specialized/pclmulqdq.rs",
+        "crc32fast-1.2.0/src/table.rs",
+    ],
+    archive = ":crc32fast-1.2.0--archive",
+    crate = "crc32fast",
+    crate_root = "crc32fast-1.2.0/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :crc32fast-1.2.0-build-script-build-args)",
+    ],
+    deps = [":cfg-if"],
+)
+
+third_party_rust_binary(
+    name = "crc32fast-1.2.0-build-script-build",
+    srcs = [
+        "crc32fast-1.2.0/benches/bench.rs",
+        "crc32fast-1.2.0/build.rs",
+        "crc32fast-1.2.0/src/baseline.rs",
+        "crc32fast-1.2.0/src/combine.rs",
+        "crc32fast-1.2.0/src/lib.rs",
+        "crc32fast-1.2.0/src/specialized/aarch64.rs",
+        "crc32fast-1.2.0/src/specialized/mod.rs",
+        "crc32fast-1.2.0/src/specialized/pclmulqdq.rs",
+        "crc32fast-1.2.0/src/table.rs",
+    ],
+    archive = ":crc32fast-1.2.0--archive",
+    crate = "build_script_build",
+    crate_root = "crc32fast-1.2.0/build.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
+third_party_rust_library(
+    name = "crossbeam-0.7.3",
+    srcs = ["crossbeam-0.7.3/src/lib.rs"],
+    archive = ":crossbeam-0.7.3--archive",
+    crate = "crossbeam",
+    crate_root = "crossbeam-0.7.3/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "crossbeam-channel",
+        "crossbeam-deque",
+        "crossbeam-queue",
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":cfg-if",
+        ":crossbeam-channel-0.4.4",
+        ":crossbeam-deque-0.7.3",
+        ":crossbeam-epoch-0.8.2",
+        ":crossbeam-queue-0.2.3",
+        ":crossbeam-utils-0.7.2",
+    ],
+)
+
 third_party_rust_library(
     name = "crossbeam-channel",
     srcs = [
@@ -3374,18 +3804,41 @@ third_party_rust_library(
 )
 
 third_party_rust_library(
-    name = "crossbeam-deque-0.8.0",
-    srcs = [
-        "crossbeam-deque-0.8.0/src/deque.rs",
-        "crossbeam-deque-0.8.0/src/lib.rs",
-    ],
-    archive = ":crossbeam-deque-0.8.0--archive",
+    name = "crossbeam-deque-0.7.3",
+    srcs = ["crossbeam-deque-0.7.3/src/lib.rs"],
+    archive = ":crossbeam-deque-0.7.3--archive",
     crate = "crossbeam_deque",
-    crate_root = "crossbeam-deque-0.8.0/src/lib.rs",
-    edition = "2018",
+    crate_root = "crossbeam-deque-0.7.3/src/lib.rs",
+    edition = "2015",
     env = {
     },
-    features = [
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":crossbeam-epoch-0.8.2",
+        ":crossbeam-utils-0.7.2",
+        ":maybe-uninit-2.0.0",
+    ],
+)
+
+third_party_rust_library(
+    name = "crossbeam-deque-0.8.0",
+    srcs = [
+        "crossbeam-deque-0.8.0/src/deque.rs",
+        "crossbeam-deque-0.8.0/src/lib.rs",
+    ],
+    archive = ":crossbeam-deque-0.8.0--archive",
+    crate = "crossbeam_deque",
+    crate_root = "crossbeam-deque-0.8.0/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
         "crossbeam-epoch",
         "crossbeam-utils",
         "default",
@@ -3404,6 +3857,92 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "crossbeam-epoch-0.8.2",
+    srcs = [
+        "crossbeam-epoch-0.8.2/src/atomic.rs",
+        "crossbeam-epoch-0.8.2/src/collector.rs",
+        "crossbeam-epoch-0.8.2/src/default.rs",
+        "crossbeam-epoch-0.8.2/src/deferred.rs",
+        "crossbeam-epoch-0.8.2/src/epoch.rs",
+        "crossbeam-epoch-0.8.2/src/guard.rs",
+        "crossbeam-epoch-0.8.2/src/internal.rs",
+        "crossbeam-epoch-0.8.2/src/lib.rs",
+        "crossbeam-epoch-0.8.2/src/sync/list.rs",
+        "crossbeam-epoch-0.8.2/src/sync/mod.rs",
+        "crossbeam-epoch-0.8.2/src/sync/queue.rs",
+    ],
+    archive = ":crossbeam-epoch-0.8.2--archive",
+    crate = "crossbeam_epoch",
+    crate_root = "crossbeam-epoch-0.8.2/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "lazy_static",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :crossbeam-epoch-0.8.2-build-script-build-args)",
+    ],
+    deps = [
+        ":cfg-if",
+        ":crossbeam-utils-0.7.2",
+        ":lazy_static",
+        ":maybe-uninit-2.0.0",
+        ":memoffset-0.5.6",
+        ":scopeguard",
+    ],
+)
+
+third_party_rust_binary(
+    name = "crossbeam-epoch-0.8.2-build-script-build",
+    srcs = [
+        "crossbeam-epoch-0.8.2/benches/defer.rs",
+        "crossbeam-epoch-0.8.2/benches/flush.rs",
+        "crossbeam-epoch-0.8.2/benches/pin.rs",
+        "crossbeam-epoch-0.8.2/build.rs",
+        "crossbeam-epoch-0.8.2/examples/sanitize.rs",
+        "crossbeam-epoch-0.8.2/examples/treiber_stack.rs",
+        "crossbeam-epoch-0.8.2/src/atomic.rs",
+        "crossbeam-epoch-0.8.2/src/collector.rs",
+        "crossbeam-epoch-0.8.2/src/default.rs",
+        "crossbeam-epoch-0.8.2/src/deferred.rs",
+        "crossbeam-epoch-0.8.2/src/epoch.rs",
+        "crossbeam-epoch-0.8.2/src/guard.rs",
+        "crossbeam-epoch-0.8.2/src/internal.rs",
+        "crossbeam-epoch-0.8.2/src/lib.rs",
+        "crossbeam-epoch-0.8.2/src/sync/list.rs",
+        "crossbeam-epoch-0.8.2/src/sync/mod.rs",
+        "crossbeam-epoch-0.8.2/src/sync/queue.rs",
+    ],
+    archive = ":crossbeam-epoch-0.8.2--archive",
+    crate = "build_script_build",
+    crate_root = "crossbeam-epoch-0.8.2/build.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "lazy_static",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":autocfg-1.0.1"],
+)
+
 third_party_rust_library(
     name = "crossbeam-epoch-0.9.1",
     srcs = [
@@ -3446,6 +3985,37 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "crossbeam-queue-0.2.3",
+    srcs = [
+        "crossbeam-queue-0.2.3/src/array_queue.rs",
+        "crossbeam-queue-0.2.3/src/err.rs",
+        "crossbeam-queue-0.2.3/src/lib.rs",
+        "crossbeam-queue-0.2.3/src/seg_queue.rs",
+    ],
+    archive = ":crossbeam-queue-0.2.3--archive",
+    crate = "crossbeam_queue",
+    crate_root = "crossbeam-queue-0.2.3/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":cfg-if",
+        ":crossbeam-utils-0.7.2",
+        ":maybe-uninit-2.0.0",
+    ],
+)
+
 third_party_rust_library(
     name = "crossbeam-utils-0.7.2",
     srcs = [
@@ -4720,6 +5290,64 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "flate2",
+    srcs = [
+        "flate2-1.0.14/src/bufreader.rs",
+        "flate2-1.0.14/src/crc.rs",
+        "flate2-1.0.14/src/deflate/bufread.rs",
+        "flate2-1.0.14/src/deflate/mod.rs",
+        "flate2-1.0.14/src/deflate/read.rs",
+        "flate2-1.0.14/src/deflate/write.rs",
+        "flate2-1.0.14/src/ffi/c.rs",
+        "flate2-1.0.14/src/ffi/mod.rs",
+        "flate2-1.0.14/src/ffi/rust.rs",
+        "flate2-1.0.14/src/gz/bufread.rs",
+        "flate2-1.0.14/src/gz/mod.rs",
+        "flate2-1.0.14/src/gz/read.rs",
+        "flate2-1.0.14/src/gz/write.rs",
+        "flate2-1.0.14/src/lib.rs",
+        "flate2-1.0.14/src/mem.rs",
+        "flate2-1.0.14/src/zio.rs",
+        "flate2-1.0.14/src/zlib/bufread.rs",
+        "flate2-1.0.14/src/zlib/mod.rs",
+        "flate2-1.0.14/src/zlib/read.rs",
+        "flate2-1.0.14/src/zlib/write.rs",
+    ],
+    archive = ":flate2-1.0.14--archive",
+    crate = "flate2",
+    crate_root = "flate2-1.0.14/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "any_zlib",
+        "default",
+        "futures",
+        "libz-sys",
+        "miniz_oxide",
+        "rust_backend",
+        "tokio",
+        "tokio-io",
+        "zlib",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":cfg-if",
+        ":crc32fast-1.2.0",
+        ":futures-old",
+        ":libc",
+        ":libz-sys-1.1.2",
+        ":miniz_oxide-0.3.7",
+        ":tokio-io",
+    ],
+)
+
 third_party_rust_library(
     name = "fnv",
     srcs = ["fnv-1.0.7/lib.rs"],
@@ -4742,6 +5370,44 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "foreign-types",
+    srcs = ["foreign-types-0.3.2/src/lib.rs"],
+    archive = ":foreign-types-0.3.2--archive",
+    crate = "foreign_types",
+    crate_root = "foreign-types-0.3.2/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":foreign-types-shared-0.1.1"],
+)
+
+third_party_rust_library(
+    name = "foreign-types-shared-0.1.1",
+    srcs = ["foreign-types-shared-0.1.1/src/lib.rs"],
+    archive = ":foreign-types-shared-0.1.1--archive",
+    crate = "foreign_types_shared",
+    crate_root = "foreign-types-shared-0.1.1/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "form_urlencoded-1.0.0",
     srcs = [
@@ -7184,6 +7850,180 @@ third_party_rust_library(
     deps = [":spin-0.5.2"],
 )
 
+third_party_rust_library(
+    name = "lexical-5.2.0",
+    srcs = ["lexical-5.2.0/src/lib.rs"],
+    archive = ":lexical-5.2.0--archive",
+    crate = "lexical",
+    crate_root = "lexical-5.2.0/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "correct",
+        "default",
+        "ryu",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":cfg-if",
+        ":lexical-core",
+    ],
+)
+
+third_party_rust_library(
+    name = "lexical-core",
+    srcs = [
+        "lexical-core-0.7.6/src/atof/algorithm/alias.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/bhcomp.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/bigcomp.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/bignum.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/cached.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/cached_float160.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/cached_float80.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/correct.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/errors.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/exponent.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/generic.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/ignore.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/interface.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/mod.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/permissive.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/standard.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/traits.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/trim.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/format/validate.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/incorrect.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/large_powers.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/large_powers_32.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/large_powers_64.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/math.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/mod.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/small_powers.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/small_powers_32.rs",
+        "lexical-core-0.7.6/src/atof/algorithm/small_powers_64.rs",
+        "lexical-core-0.7.6/src/atof/api.rs",
+        "lexical-core-0.7.6/src/atof/mod.rs",
+        "lexical-core-0.7.6/src/atoi/api.rs",
+        "lexical-core-0.7.6/src/atoi/exponent.rs",
+        "lexical-core-0.7.6/src/atoi/generic.rs",
+        "lexical-core-0.7.6/src/atoi/mantissa.rs",
+        "lexical-core-0.7.6/src/atoi/mod.rs",
+        "lexical-core-0.7.6/src/atoi/shared.rs",
+        "lexical-core-0.7.6/src/float/convert.rs",
+        "lexical-core-0.7.6/src/float/float.rs",
+        "lexical-core-0.7.6/src/float/mantissa.rs",
+        "lexical-core-0.7.6/src/float/mod.rs",
+        "lexical-core-0.7.6/src/float/rounding.rs",
+        "lexical-core-0.7.6/src/float/shift.rs",
+        "lexical-core-0.7.6/src/ftoa/api.rs",
+        "lexical-core-0.7.6/src/ftoa/grisu2.rs",
+        "lexical-core-0.7.6/src/ftoa/grisu3.rs",
+        "lexical-core-0.7.6/src/ftoa/mod.rs",
+        "lexical-core-0.7.6/src/ftoa/radix.rs",
+        "lexical-core-0.7.6/src/ftoa/ryu.rs",
+        "lexical-core-0.7.6/src/itoa/api.rs",
+        "lexical-core-0.7.6/src/itoa/decimal.rs",
+        "lexical-core-0.7.6/src/itoa/generic.rs",
+        "lexical-core-0.7.6/src/itoa/mod.rs",
+        "lexical-core-0.7.6/src/itoa/naive.rs",
+        "lexical-core-0.7.6/src/lib.rs",
+        "lexical-core-0.7.6/src/util/algorithm.rs",
+        "lexical-core-0.7.6/src/util/assert.rs",
+        "lexical-core-0.7.6/src/util/cast.rs",
+        "lexical-core-0.7.6/src/util/config.rs",
+        "lexical-core-0.7.6/src/util/consume.rs",
+        "lexical-core-0.7.6/src/util/div128.rs",
+        "lexical-core-0.7.6/src/util/error.rs",
+        "lexical-core-0.7.6/src/util/format.rs",
+        "lexical-core-0.7.6/src/util/format/feature_format.rs",
+        "lexical-core-0.7.6/src/util/format/not_feature_format.rs",
+        "lexical-core-0.7.6/src/util/index.rs",
+        "lexical-core-0.7.6/src/util/iterator.rs",
+        "lexical-core-0.7.6/src/util/mask.rs",
+        "lexical-core-0.7.6/src/util/mod.rs",
+        "lexical-core-0.7.6/src/util/num.rs",
+        "lexical-core-0.7.6/src/util/perftools.rs",
+        "lexical-core-0.7.6/src/util/pow.rs",
+        "lexical-core-0.7.6/src/util/primitive.rs",
+        "lexical-core-0.7.6/src/util/result.rs",
+        "lexical-core-0.7.6/src/util/rounding.rs",
+        "lexical-core-0.7.6/src/util/sequence.rs",
+        "lexical-core-0.7.6/src/util/sign.rs",
+        "lexical-core-0.7.6/src/util/skip_value.rs",
+        "lexical-core-0.7.6/src/util/table.rs",
+        "lexical-core-0.7.6/src/util/test.rs",
+        "lexical-core-0.7.6/src/util/traits.rs",
+        "lexical-core-0.7.6/src/util/wrapped.rs",
+    ],
+    archive = ":lexical-core-0.7.6--archive",
+    crate = "lexical_core",
+    crate_root = "lexical-core-0.7.6/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "arrayvec",
+        "correct",
+        "default",
+        "format",
+        "ryu",
+        "static_assertions",
+        "std",
+        "table",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :lexical-core-0.7.6-build-script-build-args)",
+    ],
+    deps = [
+        ":arrayvec",
+        ":bitflags",
+        ":cfg-if-1.0.0",
+        ":ryu-1.0.5",
+        ":static_assertions",
+    ],
+)
+
+third_party_rust_binary(
+    name = "lexical-core-0.7.6-build-script-build",
+    srcs = ["lexical-core-0.7.6/build.rs"],
+    archive = ":lexical-core-0.7.6--archive",
+    crate = "build_script_build",
+    crate_root = "lexical-core-0.7.6/build.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "arrayvec",
+        "correct",
+        "default",
+        "format",
+        "ryu",
+        "static_assertions",
+        "std",
+        "table",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "libc",
     srcs = [
@@ -7730,6 +8570,29 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "libz-sys-1.1.2",
+    srcs = ["libz-sys-1.1.2/src/lib.rs"],
+    archive = ":libz-sys-1.1.2--archive",
+    crate = "libz_sys",
+    crate_root = "libz-sys-1.1.2/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "libc",
+        "stock-zlib",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":libc"],
+)
+
 third_party_rust_library(
     name = "link-cplusplus-1.0.3",
     srcs = ["link-cplusplus-1.0.3/src/lib.rs"],
@@ -8249,6 +9112,58 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "memoffset-0.5.6",
+    srcs = [
+        "memoffset-0.5.6/src/lib.rs",
+        "memoffset-0.5.6/src/offset_of.rs",
+        "memoffset-0.5.6/src/raw_field.rs",
+        "memoffset-0.5.6/src/span_of.rs",
+    ],
+    archive = ":memoffset-0.5.6--archive",
+    crate = "memoffset",
+    crate_root = "memoffset-0.5.6/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = ["default"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :memoffset-0.5.6-build-script-build-args)",
+    ],
+    deps = [],
+)
+
+third_party_rust_binary(
+    name = "memoffset-0.5.6-build-script-build",
+    srcs = [
+        "memoffset-0.5.6/build.rs",
+        "memoffset-0.5.6/src/lib.rs",
+        "memoffset-0.5.6/src/offset_of.rs",
+        "memoffset-0.5.6/src/raw_field.rs",
+        "memoffset-0.5.6/src/span_of.rs",
+    ],
+    archive = ":memoffset-0.5.6--archive",
+    crate = "build_script_build",
+    crate_root = "memoffset-0.5.6/build.rs",
+    edition = "2015",
+    env = {
+    },
+    features = ["default"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":autocfg-1.0.1"],
+)
+
 third_party_rust_binary(
     name = "memoffset-0.6.4-build-script-build",
     srcs = [
@@ -8359,6 +9274,36 @@ third_party_rust_binary(
     deps = [":unicase"],
 )
 
+third_party_rust_library(
+    name = "miniz_oxide-0.3.7",
+    srcs = [
+        "miniz_oxide-0.3.7/src/deflate/buffer.rs",
+        "miniz_oxide-0.3.7/src/deflate/core.rs",
+        "miniz_oxide-0.3.7/src/deflate/mod.rs",
+        "miniz_oxide-0.3.7/src/deflate/stream.rs",
+        "miniz_oxide-0.3.7/src/inflate/core.rs",
+        "miniz_oxide-0.3.7/src/inflate/mod.rs",
+        "miniz_oxide-0.3.7/src/inflate/output_buffer.rs",
+        "miniz_oxide-0.3.7/src/inflate/stream.rs",
+        "miniz_oxide-0.3.7/src/lib.rs",
+        "miniz_oxide-0.3.7/src/shared.rs",
+    ],
+    archive = ":miniz_oxide-0.3.7--archive",
+    crate = "miniz_oxide",
+    crate_root = "miniz_oxide-0.3.7/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":adler32-1.2.0"],
+)
+
 third_party_rust_library(
     name = "miniz_oxide-0.4.2",
     srcs = [
@@ -8550,6 +9495,28 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "mio-named-pipes-0.1.7",
+    srcs = [
+        "mio-named-pipes-0.1.7/src/from_raw_arc.rs",
+        "mio-named-pipes-0.1.7/src/lib.rs",
+    ],
+    archive = ":mio-named-pipes-0.1.7--archive",
+    crate = "mio_named_pipes",
+    crate_root = "mio-named-pipes-0.1.7/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "mio-uds-0.6.8",
     srcs = [
@@ -8634,6 +9601,173 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "mysql_async",
+    srcs = [
+        "mysql_async-0.23.1/src/conn/mod.rs",
+        "mysql_async-0.23.1/src/conn/pool/futures/disconnect_pool.rs",
+        "mysql_async-0.23.1/src/conn/pool/futures/get_conn.rs",
+        "mysql_async-0.23.1/src/conn/pool/futures/mod.rs",
+        "mysql_async-0.23.1/src/conn/pool/mod.rs",
+        "mysql_async-0.23.1/src/conn/pool/recycler.rs",
+        "mysql_async-0.23.1/src/conn/pool/ttl_check_inerval.rs",
+        "mysql_async-0.23.1/src/conn/stmt_cache.rs",
+        "mysql_async-0.23.1/src/connection_like/mod.rs",
+        "mysql_async-0.23.1/src/connection_like/read_packet.rs",
+        "mysql_async-0.23.1/src/connection_like/write_packet.rs",
+        "mysql_async-0.23.1/src/error.rs",
+        "mysql_async-0.23.1/src/io/async_tls.rs",
+        "mysql_async-0.23.1/src/io/futures/connecting_tcp_stream.rs",
+        "mysql_async-0.23.1/src/io/futures/mod.rs",
+        "mysql_async-0.23.1/src/io/futures/write_packet.rs",
+        "mysql_async-0.23.1/src/io/mod.rs",
+        "mysql_async-0.23.1/src/io/socket.rs",
+        "mysql_async-0.23.1/src/lib.rs",
+        "mysql_async-0.23.1/src/local_infile_handler/builtin.rs",
+        "mysql_async-0.23.1/src/local_infile_handler/mod.rs",
+        "mysql_async-0.23.1/src/macros.rs",
+        "mysql_async-0.23.1/src/opts.rs",
+        "mysql_async-0.23.1/src/queryable/mod.rs",
+        "mysql_async-0.23.1/src/queryable/query_result/mod.rs",
+        "mysql_async-0.23.1/src/queryable/stmt.rs",
+        "mysql_async-0.23.1/src/queryable/transaction.rs",
+    ],
+    archive = ":mysql_async-0.23.1--archive",
+    crate = "mysql_async",
+    crate_root = "mysql_async-0.23.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":bytes-05",
+        ":crossbeam-0.7.3",
+        ":futures-core",
+        ":futures-sink",
+        ":futures-util",
+        ":lazy_static",
+        ":mio-named-pipes-0.1.7",
+        ":mysql_common",
+        ":native-tls",
+        ":percent-encoding",
+        ":pin-project",
+        ":serde",
+        ":serde_json",
+        ":thiserror",
+        ":tokio-02",
+        ":tokio-tls",
+        ":tokio-util-0.2.0",
+        ":twox-hash",
+        ":url",
+    ],
+)
+
+third_party_rust_library(
+    name = "mysql_common",
+    srcs = [
+        "mysql_common-0.22.2/src/constants.rs",
+        "mysql_common-0.22.2/src/crypto/der.rs",
+        "mysql_common-0.22.2/src/crypto/mod.rs",
+        "mysql_common-0.22.2/src/crypto/rsa.rs",
+        "mysql_common-0.22.2/src/io.rs",
+        "mysql_common-0.22.2/src/lib.rs",
+        "mysql_common-0.22.2/src/misc.rs",
+        "mysql_common-0.22.2/src/named_params.rs",
+        "mysql_common-0.22.2/src/packets.rs",
+        "mysql_common-0.22.2/src/params.rs",
+        "mysql_common-0.22.2/src/proto/codec/error.rs",
+        "mysql_common-0.22.2/src/proto/codec/mod.rs",
+        "mysql_common-0.22.2/src/proto/mod.rs",
+        "mysql_common-0.22.2/src/proto/sync_framed.rs",
+        "mysql_common-0.22.2/src/row/convert.rs",
+        "mysql_common-0.22.2/src/row/mod.rs",
+        "mysql_common-0.22.2/src/scramble.rs",
+        "mysql_common-0.22.2/src/value/convert/bigdecimal.rs",
+        "mysql_common-0.22.2/src/value/convert/bigint.rs",
+        "mysql_common-0.22.2/src/value/convert/decimal.rs",
+        "mysql_common-0.22.2/src/value/convert/mod.rs",
+        "mysql_common-0.22.2/src/value/json/mod.rs",
+        "mysql_common-0.22.2/src/value/json/serde_integration.rs",
+        "mysql_common-0.22.2/src/value/mod.rs",
+    ],
+    archive = ":mysql_common-0.22.2--archive",
+    crate = "mysql_common",
+    crate_root = "mysql_common-0.22.2/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = ["default"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":base64-0.12.3",
+        ":bigdecimal-0.1.2",
+        ":bitflags",
+        ":byteorder",
+        ":bytes-05",
+        ":chrono",
+        ":failure-deprecated",
+        ":flate2",
+        ":lazy_static",
+        ":lexical-5.2.0",
+        ":num-bigint-0.2.6",
+        ":num-traits",
+        ":rand",
+        ":regex",
+        ":rust_decimal-1.8.1",
+        ":serde",
+        ":serde_json",
+        ":sha1",
+        ":sha2",
+        ":time",
+        ":twox-hash",
+        ":uuid",
+    ],
+)
+
+third_party_rust_library(
+    name = "native-tls",
+    srcs = [
+        "native-tls-0.2.4/src/imp/openssl.rs",
+        "native-tls-0.2.4/src/imp/schannel.rs",
+        "native-tls-0.2.4/src/imp/security_framework.rs",
+        "native-tls-0.2.4/src/lib.rs",
+        "native-tls-0.2.4/src/test.rs",
+    ],
+    archive = ":native-tls-0.2.4--archive",
+    crate = "native_tls",
+    crate_root = "native-tls-0.2.4/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "--cfg=have_min_max_version",
+    ],
+    deps = [
+        ":log",
+        ":openssl",
+        ":openssl-probe-0.1.2",
+        ":openssl-sys",
+    ],
+)
+
 third_party_rust_library(
     name = "net2-0.2.37",
     srcs = [
@@ -8849,6 +9983,93 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "num-bigint-0.2.6",
+    srcs = [
+        "num-bigint-0.2.6/src/algorithms.rs",
+        "num-bigint-0.2.6/src/bigint.rs",
+        "num-bigint-0.2.6/src/bigrand.rs",
+        "num-bigint-0.2.6/src/biguint.rs",
+        "num-bigint-0.2.6/src/lib.rs",
+        "num-bigint-0.2.6/src/macros.rs",
+        "num-bigint-0.2.6/src/monty.rs",
+    ],
+    archive = ":num-bigint-0.2.6--archive",
+    crate = "num_bigint",
+    crate_root = "num-bigint-0.2.6/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "i128",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :num-bigint-0.2.6-build-script-build-args)",
+    ],
+    deps = [
+        ":num-integer-0.1.44",
+        ":num-traits",
+    ],
+)
+
+third_party_rust_binary(
+    name = "num-bigint-0.2.6-build-script-build",
+    srcs = [
+        "num-bigint-0.2.6/benches/bigint.rs",
+        "num-bigint-0.2.6/benches/factorial.rs",
+        "num-bigint-0.2.6/benches/gcd.rs",
+        "num-bigint-0.2.6/benches/roots.rs",
+        "num-bigint-0.2.6/benches/shootout-pidigits.rs",
+        "num-bigint-0.2.6/build.rs",
+        "num-bigint-0.2.6/src/algorithms.rs",
+        "num-bigint-0.2.6/src/bigint.rs",
+        "num-bigint-0.2.6/src/bigrand.rs",
+        "num-bigint-0.2.6/src/biguint.rs",
+        "num-bigint-0.2.6/src/lib.rs",
+        "num-bigint-0.2.6/src/macros.rs",
+        "num-bigint-0.2.6/src/monty.rs",
+        "num-bigint-0.2.6/tests/bigint.rs",
+        "num-bigint-0.2.6/tests/bigint_bitwise.rs",
+        "num-bigint-0.2.6/tests/bigint_scalar.rs",
+        "num-bigint-0.2.6/tests/biguint.rs",
+        "num-bigint-0.2.6/tests/biguint_scalar.rs",
+        "num-bigint-0.2.6/tests/consts/mod.rs",
+        "num-bigint-0.2.6/tests/macros/mod.rs",
+        "num-bigint-0.2.6/tests/modpow.rs",
+        "num-bigint-0.2.6/tests/quickcheck.rs",
+        "num-bigint-0.2.6/tests/rand.rs",
+        "num-bigint-0.2.6/tests/roots.rs",
+        "num-bigint-0.2.6/tests/serde.rs",
+        "num-bigint-0.2.6/tests/torture.rs",
+    ],
+    archive = ":num-bigint-0.2.6--archive",
+    crate = "build_script_build",
+    crate_root = "num-bigint-0.2.6/build.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [
+        "default",
+        "i128",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":autocfg-1.0.1"],
+)
+
 third_party_rust_library(
     name = "num-derive",
     srcs = [
@@ -9185,6 +10406,122 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "openssl",
+    srcs = [
+        "openssl-0.10.35/src/aes.rs",
+        "openssl-0.10.35/src/asn1.rs",
+        "openssl-0.10.35/src/base64.rs",
+        "openssl-0.10.35/src/bio.rs",
+        "openssl-0.10.35/src/bn.rs",
+        "openssl-0.10.35/src/cms.rs",
+        "openssl-0.10.35/src/conf.rs",
+        "openssl-0.10.35/src/derive.rs",
+        "openssl-0.10.35/src/dh.rs",
+        "openssl-0.10.35/src/dsa.rs",
+        "openssl-0.10.35/src/ec.rs",
+        "openssl-0.10.35/src/ecdsa.rs",
+        "openssl-0.10.35/src/encrypt.rs",
+        "openssl-0.10.35/src/envelope.rs",
+        "openssl-0.10.35/src/error.rs",
+        "openssl-0.10.35/src/ex_data.rs",
+        "openssl-0.10.35/src/fips.rs",
+        "openssl-0.10.35/src/hash.rs",
+        "openssl-0.10.35/src/lib.rs",
+        "openssl-0.10.35/src/macros.rs",
+        "openssl-0.10.35/src/memcmp.rs",
+        "openssl-0.10.35/src/nid.rs",
+        "openssl-0.10.35/src/ocsp.rs",
+        "openssl-0.10.35/src/pkcs12.rs",
+        "openssl-0.10.35/src/pkcs5.rs",
+        "openssl-0.10.35/src/pkcs7.rs",
+        "openssl-0.10.35/src/pkey.rs",
+        "openssl-0.10.35/src/rand.rs",
+        "openssl-0.10.35/src/rsa.rs",
+        "openssl-0.10.35/src/sha.rs",
+        "openssl-0.10.35/src/sign.rs",
+        "openssl-0.10.35/src/srtp.rs",
+        "openssl-0.10.35/src/ssl/bio.rs",
+        "openssl-0.10.35/src/ssl/callbacks.rs",
+        "openssl-0.10.35/src/ssl/connector.rs",
+        "openssl-0.10.35/src/ssl/error.rs",
+        "openssl-0.10.35/src/ssl/mod.rs",
+        "openssl-0.10.35/src/ssl/test/mod.rs",
+        "openssl-0.10.35/src/ssl/test/server.rs",
+        "openssl-0.10.35/src/stack.rs",
+        "openssl-0.10.35/src/string.rs",
+        "openssl-0.10.35/src/symm.rs",
+        "openssl-0.10.35/src/util.rs",
+        "openssl-0.10.35/src/version.rs",
+        "openssl-0.10.35/src/x509/extension.rs",
+        "openssl-0.10.35/src/x509/mod.rs",
+        "openssl-0.10.35/src/x509/store.rs",
+        "openssl-0.10.35/src/x509/tests.rs",
+        "openssl-0.10.35/src/x509/verify.rs",
+        "openssl-0.10.35/test/aia_test_cert.pem",
+        "openssl-0.10.35/test/alt_name_cert.pem",
+        "openssl-0.10.35/test/cert.pem",
+        "openssl-0.10.35/test/certs.pem",
+        "openssl-0.10.35/test/cms.p12",
+        "openssl-0.10.35/test/cms_pubkey.der",
+        "openssl-0.10.35/test/dhparams.pem",
+        "openssl-0.10.35/test/identity.p12",
+        "openssl-0.10.35/test/key.der",
+        "openssl-0.10.35/test/key.der.pub",
+        "openssl-0.10.35/test/key.pem",
+        "openssl-0.10.35/test/key.pem.pub",
+        "openssl-0.10.35/test/keystore-empty-chain.p12",
+        "openssl-0.10.35/test/nid_test_cert.pem",
+        "openssl-0.10.35/test/nid_uid_test_cert.pem",
+        "openssl-0.10.35/test/pkcs1.pem.pub",
+        "openssl-0.10.35/test/pkcs8.der",
+        "openssl-0.10.35/test/pkcs8-nocrypt.der",
+        "openssl-0.10.35/test/root-ca.pem",
+        "openssl-0.10.35/test/rsa.pem",
+        "openssl-0.10.35/test/rsa.pem.pub",
+        "openssl-0.10.35/test/rsa-encrypted.pem",
+    ],
+    archive = ":openssl-0.10.35--archive",
+    crate = "openssl",
+    crate_root = "openssl-0.10.35/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+        "ffi": ":openssl-sys",
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "--cfg=ossl101",
+        "--cfg=ossl102",
+        "--cfg=ossl102f",
+        "--cfg=ossl102h",
+        "--cfg=ossl110",
+        "--cfg=ossl110f",
+        "--cfg=ossl110g",
+        "--cfg=osslconf=\"OPENSSL_NO_BUF_FREELISTS\"",
+        "--cfg=osslconf=\"OPENSSL_NO_COMP\"",
+        "--cfg=osslconf=\"OPENSSL_NO_EC\"",
+        "--cfg=osslconf=\"OPENSSL_NO_EC2M\"",
+        "--cfg=osslconf=\"OPENSSL_NO_ENGINE\"",
+        "--cfg=osslconf=\"OPENSSL_NO_KRB5\"",
+        "--cfg=osslconf=\"OPENSSL_NO_SHA\"",
+        "--cfg=osslconf=\"OPENSSL_NO_SSL3_METHOD\"",
+        "--cfg=osslconf=\"OPENSSL_NO_TLSEXT\"",
+    ],
+    deps = [
+        ":bitflags",
+        ":cfg-if-1.0.0",
+        ":foreign-types",
+        ":libc",
+        ":once_cell",
+    ],
+)
+
 third_party_rust_library(
     name = "openssl-probe-0.1.2",
     srcs = ["openssl-probe-0.1.2/src/lib.rs"],
@@ -9204,6 +10541,80 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "openssl-sys",
+    srcs = [
+        "openssl-sys-0.9.65/src/aes.rs",
+        "openssl-sys-0.9.65/src/asn1.rs",
+        "openssl-sys-0.9.65/src/bio.rs",
+        "openssl-sys-0.9.65/src/bn.rs",
+        "openssl-sys-0.9.65/src/cms.rs",
+        "openssl-sys-0.9.65/src/conf.rs",
+        "openssl-sys-0.9.65/src/crypto.rs",
+        "openssl-sys-0.9.65/src/dh.rs",
+        "openssl-sys-0.9.65/src/dsa.rs",
+        "openssl-sys-0.9.65/src/dtls1.rs",
+        "openssl-sys-0.9.65/src/ec.rs",
+        "openssl-sys-0.9.65/src/err.rs",
+        "openssl-sys-0.9.65/src/evp.rs",
+        "openssl-sys-0.9.65/src/hmac.rs",
+        "openssl-sys-0.9.65/src/lib.rs",
+        "openssl-sys-0.9.65/src/macros.rs",
+        "openssl-sys-0.9.65/src/obj_mac.rs",
+        "openssl-sys-0.9.65/src/object.rs",
+        "openssl-sys-0.9.65/src/ocsp.rs",
+        "openssl-sys-0.9.65/src/ossl_typ.rs",
+        "openssl-sys-0.9.65/src/pem.rs",
+        "openssl-sys-0.9.65/src/pkcs12.rs",
+        "openssl-sys-0.9.65/src/pkcs7.rs",
+        "openssl-sys-0.9.65/src/rand.rs",
+        "openssl-sys-0.9.65/src/rsa.rs",
+        "openssl-sys-0.9.65/src/safestack.rs",
+        "openssl-sys-0.9.65/src/sha.rs",
+        "openssl-sys-0.9.65/src/srtp.rs",
+        "openssl-sys-0.9.65/src/ssl.rs",
+        "openssl-sys-0.9.65/src/ssl3.rs",
+        "openssl-sys-0.9.65/src/stack.rs",
+        "openssl-sys-0.9.65/src/tls1.rs",
+        "openssl-sys-0.9.65/src/types.rs",
+        "openssl-sys-0.9.65/src/x509.rs",
+        "openssl-sys-0.9.65/src/x509_vfy.rs",
+        "openssl-sys-0.9.65/src/x509v3.rs",
+    ],
+    archive = ":openssl-sys-0.9.65--archive",
+    crate = "openssl_sys",
+    crate_root = "openssl-sys-0.9.65/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "--cfg=ossl101",
+        "--cfg=ossl102",
+        "--cfg=ossl102f",
+        "--cfg=ossl102h",
+        "--cfg=ossl110",
+        "--cfg=ossl110f",
+        "--cfg=ossl110g",
+        "--cfg=osslconf=\"OPENSSL_NO_BUF_FREELISTS\"",
+        "--cfg=osslconf=\"OPENSSL_NO_COMP\"",
+        "--cfg=osslconf=\"OPENSSL_NO_EC\"",
+        "--cfg=osslconf=\"OPENSSL_NO_EC2M\"",
+        "--cfg=osslconf=\"OPENSSL_NO_ENGINE\"",
+        "--cfg=osslconf=\"OPENSSL_NO_KRB5\"",
+        "--cfg=osslconf=\"OPENSSL_NO_SHA\"",
+        "--cfg=osslconf=\"OPENSSL_NO_SSL3_METHOD\"",
+        "--cfg=osslconf=\"OPENSSL_NO_TLSEXT\"",
+    ],
+    deps = [":libc"],
+)
+
 third_party_rust_library(
     name = "ordered-float",
     srcs = ["ordered-float-1.1.1/src/lib.rs"],
@@ -11397,6 +12808,38 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "rust_decimal-1.8.1",
+    srcs = [
+        "rust_decimal-1.8.1/src/decimal.rs",
+        "rust_decimal-1.8.1/src/error.rs",
+        "rust_decimal-1.8.1/src/lib.rs",
+        "rust_decimal-1.8.1/src/postgres.rs",
+        "rust_decimal-1.8.1/src/serde_types.rs",
+    ],
+    archive = ":rust_decimal-1.8.1--archive",
+    crate = "rust_decimal",
+    crate_root = "rust_decimal-1.8.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "serde",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":num-traits",
+        ":serde",
+    ],
+)
+
 third_party_rust_library(
     name = "rustc-demangle",
     srcs = [
@@ -12114,6 +13557,7 @@ third_party_rust_library(
         "--cfg=limb_width_64",
     ],
     deps = [
+        ":indexmap",
         ":itoa-0.4.6",
         ":ryu-1.0.5",
         ":serde",
@@ -12246,6 +13690,28 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "sha1",
+    srcs = [
+        "sha1-0.6.0/src/lib.rs",
+        "sha1-0.6.0/src/simd.rs",
+    ],
+    archive = ":sha1-0.6.0--archive",
+    crate = "sha1",
+    crate_root = "sha1-0.6.0/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [],
+)
+
 third_party_rust_library(
     name = "sha2",
     srcs = [
@@ -12613,6 +14079,69 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "standback-0.2.10",
+    srcs = [
+        "standback-0.2.10/src/lib.rs",
+        "standback-0.2.10/src/v1_32.rs",
+        "standback-0.2.10/src/v1_33.rs",
+        "standback-0.2.10/src/v1_33/pin.rs",
+        "standback-0.2.10/src/v1_34.rs",
+        "standback-0.2.10/src/v1_34/try_from.rs",
+        "standback-0.2.10/src/v1_35.rs",
+        "standback-0.2.10/src/v1_36.rs",
+        "standback-0.2.10/src/v1_36/iterator_copied.rs",
+        "standback-0.2.10/src/v1_36/maybe_uninit.rs",
+        "standback-0.2.10/src/v1_36/poll.rs",
+        "standback-0.2.10/src/v1_36/waker.rs",
+        "standback-0.2.10/src/v1_37.rs",
+        "standback-0.2.10/src/v1_38.rs",
+        "standback-0.2.10/src/v1_40.rs",
+        "standback-0.2.10/src/v1_41.rs",
+        "standback-0.2.10/src/v1_42.rs",
+        "standback-0.2.10/src/v1_43.rs",
+        "standback-0.2.10/src/v1_44.rs",
+        "standback-0.2.10/src/v1_45.rs",
+        "standback-0.2.10/src/v1_46.rs",
+    ],
+    archive = ":standback-0.2.10--archive",
+    crate = "standback",
+    crate_root = "standback-0.2.10/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = ["std"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :standback-0.2.10-build-script-build-args)",
+    ],
+    deps = [],
+)
+
+third_party_rust_binary(
+    name = "standback-0.2.10-build-script-build",
+    srcs = ["standback-0.2.10/build.rs"],
+    archive = ":standback-0.2.10--archive",
+    crate = "build_script_build",
+    crate_root = "standback-0.2.10/build.rs",
+    edition = "2018",
+    env = {
+    },
+    features = ["std"],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":version_check-0.9.2"],
+)
+
 third_party_rust_library(
     name = "static_assertions",
     srcs = [
@@ -12893,12 +14422,12 @@ third_party_rust_binary(
 third_party_rust_library(
     name = "synstructure",
     srcs = [
-        "synstructure-0.12.4/src/lib.rs",
-        "synstructure-0.12.4/src/macros.rs",
+        "synstructure-0.12.5/src/lib.rs",
+        "synstructure-0.12.5/src/macros.rs",
     ],
-    archive = ":synstructure-0.12.4--archive",
+    archive = ":synstructure-0.12.5--archive",
     crate = "synstructure",
-    crate_root = "synstructure-0.12.4/src/lib.rs",
+    crate_root = "synstructure-0.12.5/src/lib.rs",
     edition = "2018",
     env = {
     },
@@ -13217,6 +14746,100 @@ third_party_rust_library(
     deps = [":lazy_static"],
 )
 
+third_party_rust_library(
+    name = "time",
+    srcs = [
+        "time-0.2.22/src/date.rs",
+        "time-0.2.22/src/duration.rs",
+        "time-0.2.22/src/error.rs",
+        "time-0.2.22/src/ext.rs",
+        "time-0.2.22/src/format/date.rs",
+        "time-0.2.22/src/format/deferred_format.rs",
+        "time-0.2.22/src/format/format.rs",
+        "time-0.2.22/src/format/mod.rs",
+        "time-0.2.22/src/format/offset.rs",
+        "time-0.2.22/src/format/parse.rs",
+        "time-0.2.22/src/format/parse_items.rs",
+        "time-0.2.22/src/format/time.rs",
+        "time-0.2.22/src/format/well_known.rs",
+        "time-0.2.22/src/instant.rs",
+        "time-0.2.22/src/internals.rs",
+        "time-0.2.22/src/lib.rs",
+        "time-0.2.22/src/offset_date_time.rs",
+        "time-0.2.22/src/primitive_date_time.rs",
+        "time-0.2.22/src/rand.rs",
+        "time-0.2.22/src/serde/date.rs",
+        "time-0.2.22/src/serde/duration.rs",
+        "time-0.2.22/src/serde/mod.rs",
+        "time-0.2.22/src/serde/primitive_date_time.rs",
+        "time-0.2.22/src/serde/sign.rs",
+        "time-0.2.22/src/serde/time.rs",
+        "time-0.2.22/src/serde/timestamp.rs",
+        "time-0.2.22/src/serde/utc_offset.rs",
+        "time-0.2.22/src/serde/weekday.rs",
+        "time-0.2.22/src/sign.rs",
+        "time-0.2.22/src/time_mod.rs",
+        "time-0.2.22/src/utc_offset.rs",
+        "time-0.2.22/src/util.rs",
+        "time-0.2.22/src/weekday.rs",
+    ],
+    archive = ":time-0.2.22--archive",
+    crate = "time",
+    crate_root = "time-0.2.22/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "deprecated",
+        "libc",
+        "std",
+        "stdweb",
+        "winapi",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = [
+        "--cap-lints=allow",
+        "@$(location :time-0.2.22-build-script-build-args)",
+    ],
+    deps = [
+        ":const_fn-0.4.2",
+        ":libc",
+        ":standback-0.2.10",
+        ":time-macros-0.1.1",
+    ],
+)
+
+third_party_rust_binary(
+    name = "time-0.2.22-build-script-build",
+    srcs = ["time-0.2.22/build.rs"],
+    archive = ":time-0.2.22--archive",
+    crate = "build_script_build",
+    crate_root = "time-0.2.22/build.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "deprecated",
+        "libc",
+        "std",
+        "stdweb",
+        "winapi",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":version_check-0.9.2"],
+)
+
 third_party_rust_library(
     name = "time-01",
     srcs = [
@@ -13242,6 +14865,61 @@ third_party_rust_library(
     deps = [":libc"],
 )
 
+third_party_rust_library(
+    name = "time-macros-0.1.1",
+    srcs = ["time-macros-0.1.1/src/lib.rs"],
+    archive = ":time-macros-0.1.1--archive",
+    crate = "time_macros",
+    crate_root = "time-macros-0.1.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":proc-macro-hack",
+        ":time-macros-impl-0.1.1",
+    ],
+)
+
+third_party_rust_library(
+    name = "time-macros-impl-0.1.1",
+    srcs = [
+        "time-macros-impl-0.1.1/src/date.rs",
+        "time-macros-impl-0.1.1/src/ext.rs",
+        "time-macros-impl-0.1.1/src/lib.rs",
+        "time-macros-impl-0.1.1/src/offset.rs",
+        "time-macros-impl-0.1.1/src/time.rs",
+        "time-macros-impl-0.1.1/src/time_crate/date.rs",
+        "time-macros-impl-0.1.1/src/time_crate/mod.rs",
+    ],
+    archive = ":time-macros-impl-0.1.1--archive",
+    crate = "time_macros_impl",
+    crate_root = "time-macros-impl-0.1.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = True,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":proc-macro-hack",
+        ":proc-macro2",
+        ":quote",
+        ":standback-0.2.10",
+        ":syn",
+    ],
+)
+
 third_party_rust_library(
     name = "tinyvec-0.3.4",
     srcs = [
@@ -13951,6 +15629,61 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "tokio-io",
+    srcs = [
+        "tokio-io-0.1.13/src/_tokio_codec/decoder.rs",
+        "tokio-io-0.1.13/src/_tokio_codec/encoder.rs",
+        "tokio-io-0.1.13/src/_tokio_codec/framed.rs",
+        "tokio-io-0.1.13/src/_tokio_codec/framed_read.rs",
+        "tokio-io-0.1.13/src/_tokio_codec/framed_write.rs",
+        "tokio-io-0.1.13/src/_tokio_codec/mod.rs",
+        "tokio-io-0.1.13/src/allow_std.rs",
+        "tokio-io-0.1.13/src/async_read.rs",
+        "tokio-io-0.1.13/src/async_write.rs",
+        "tokio-io-0.1.13/src/codec/bytes_codec.rs",
+        "tokio-io-0.1.13/src/codec/decoder.rs",
+        "tokio-io-0.1.13/src/codec/encoder.rs",
+        "tokio-io-0.1.13/src/codec/lines_codec.rs",
+        "tokio-io-0.1.13/src/codec/mod.rs",
+        "tokio-io-0.1.13/src/framed.rs",
+        "tokio-io-0.1.13/src/framed_read.rs",
+        "tokio-io-0.1.13/src/framed_write.rs",
+        "tokio-io-0.1.13/src/io/copy.rs",
+        "tokio-io-0.1.13/src/io/flush.rs",
+        "tokio-io-0.1.13/src/io/mod.rs",
+        "tokio-io-0.1.13/src/io/read.rs",
+        "tokio-io-0.1.13/src/io/read_exact.rs",
+        "tokio-io-0.1.13/src/io/read_to_end.rs",
+        "tokio-io-0.1.13/src/io/read_until.rs",
+        "tokio-io-0.1.13/src/io/shutdown.rs",
+        "tokio-io-0.1.13/src/io/write_all.rs",
+        "tokio-io-0.1.13/src/length_delimited.rs",
+        "tokio-io-0.1.13/src/lib.rs",
+        "tokio-io-0.1.13/src/lines.rs",
+        "tokio-io-0.1.13/src/split.rs",
+        "tokio-io-0.1.13/src/window.rs",
+    ],
+    archive = ":tokio-io-0.1.13--archive",
+    crate = "tokio_io",
+    crate_root = "tokio-io-0.1.13/src/lib.rs",
+    edition = "2015",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":bytes-old",
+        ":futures-old",
+        ":log",
+    ],
+)
+
 third_party_rust_library(
     name = "tokio-macros",
     srcs = [
@@ -14112,6 +15845,28 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "tokio-tls",
+    srcs = ["tokio-tls-0.3.1/src/lib.rs"],
+    archive = ":tokio-tls-0.3.1--archive",
+    crate = "tokio_tls",
+    crate_root = "tokio-tls-0.3.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":native-tls",
+        ":tokio-02",
+    ],
+)
+
 third_party_rust_library(
     name = "tokio-tungstenite-0.13.0",
     srcs = [
@@ -14217,6 +15972,49 @@ third_party_rust_library(
     ],
 )
 
+third_party_rust_library(
+    name = "tokio-util-0.2.0",
+    srcs = [
+        "tokio-util-0.2.0/src/cfg.rs",
+        "tokio-util-0.2.0/src/codec/bytes_codec.rs",
+        "tokio-util-0.2.0/src/codec/decoder.rs",
+        "tokio-util-0.2.0/src/codec/encoder.rs",
+        "tokio-util-0.2.0/src/codec/framed.rs",
+        "tokio-util-0.2.0/src/codec/framed_read.rs",
+        "tokio-util-0.2.0/src/codec/framed_write.rs",
+        "tokio-util-0.2.0/src/codec/length_delimited.rs",
+        "tokio-util-0.2.0/src/codec/lines_codec.rs",
+        "tokio-util-0.2.0/src/codec/mod.rs",
+        "tokio-util-0.2.0/src/lib.rs",
+        "tokio-util-0.2.0/src/udp/frame.rs",
+        "tokio-util-0.2.0/src/udp/mod.rs",
+    ],
+    archive = ":tokio-util-0.2.0--archive",
+    crate = "tokio_util",
+    crate_root = "tokio-util-0.2.0/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "codec",
+        "default",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":bytes-05",
+        ":futures-core",
+        ":futures-sink",
+        ":log",
+        ":pin-project-lite-0.1.11",
+        ":tokio-02",
+    ],
+)
+
 third_party_rust_library(
     name = "tokio_shim",
     srcs = ["shed/tokio_shim/src/lib.rs"],
@@ -14899,6 +16697,35 @@ third_party_rust_library(
     deps = [":memchr-2.4.1"],
 )
 
+third_party_rust_library(
+    name = "twox-hash",
+    srcs = [
+        "twox-hash-1.5.0/src/digest_support.rs",
+        "twox-hash-1.5.0/src/lib.rs",
+        "twox-hash-1.5.0/src/sixty_four.rs",
+        "twox-hash-1.5.0/src/std_support.rs",
+        "twox-hash-1.5.0/src/thirty_two.rs",
+    ],
+    archive = ":twox-hash-1.5.0--archive",
+    crate = "twox_hash",
+    crate_root = "twox-hash-1.5.0/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "rand",
+        "std",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [":rand"],
+)
+
 third_party_rust_library(
     name = "typenum",
     srcs = [
@@ -15194,17 +17021,17 @@ third_party_rust_library(
 third_party_rust_library(
     name = "url",
     srcs = [
-        "url-2.2.0/src/host.rs",
-        "url-2.2.0/src/lib.rs",
-        "url-2.2.0/src/origin.rs",
-        "url-2.2.0/src/parser.rs",
-        "url-2.2.0/src/path_segments.rs",
-        "url-2.2.0/src/quirks.rs",
-        "url-2.2.0/src/slicing.rs",
+        "url-2.2.2/src/host.rs",
+        "url-2.2.2/src/lib.rs",
+        "url-2.2.2/src/origin.rs",
+        "url-2.2.2/src/parser.rs",
+        "url-2.2.2/src/path_segments.rs",
+        "url-2.2.2/src/quirks.rs",
+        "url-2.2.2/src/slicing.rs",
     ],
-    archive = ":url-2.2.0--archive",
+    archive = ":url-2.2.2--archive",
     crate = "url",
-    crate_root = "url-2.2.0/src/lib.rs",
+    crate_root = "url-2.2.2/src/lib.rs",
     edition = "2018",
     env = {
     },
@@ -15292,6 +17119,52 @@ third_party_rust_library(
     deps = [],
 )
 
+third_party_rust_library(
+    name = "uuid",
+    srcs = [
+        "uuid-0.8.1/src/adapter/compact.rs",
+        "uuid-0.8.1/src/adapter/mod.rs",
+        "uuid-0.8.1/src/builder/error.rs",
+        "uuid-0.8.1/src/builder/mod.rs",
+        "uuid-0.8.1/src/error.rs",
+        "uuid-0.8.1/src/lib.rs",
+        "uuid-0.8.1/src/parser/error.rs",
+        "uuid-0.8.1/src/parser/mod.rs",
+        "uuid-0.8.1/src/prelude.rs",
+        "uuid-0.8.1/src/serde_support.rs",
+        "uuid-0.8.1/src/slog_support.rs",
+        "uuid-0.8.1/src/test_util.rs",
+        "uuid-0.8.1/src/v1.rs",
+        "uuid-0.8.1/src/v3.rs",
+        "uuid-0.8.1/src/v4.rs",
+        "uuid-0.8.1/src/v5.rs",
+        "uuid-0.8.1/src/winapi_support.rs",
+    ],
+    archive = ":uuid-0.8.1--archive",
+    crate = "uuid",
+    crate_root = "uuid-0.8.1/src/lib.rs",
+    edition = "2018",
+    env = {
+    },
+    features = [
+        "default",
+        "rand",
+        "serde",
+        "std",
+        "v4",
+    ],
+    mapped_srcs = {
+    },
+    named_deps = {
+    },
+    proc_macro = False,
+    rustc_flags = ["--cap-lints=allow"],
+    deps = [
+        ":rand",
+        ":serde",
+    ],
+)
+
 third_party_rust_library(
     name = "vec_map",
     srcs = ["vec_map-0.8.2/src/lib.rs"],
diff --git a/tools/testinfra/runner/BUCK b/tools/testinfra/runner/TARGETS
similarity index 93%
rename from tools/testinfra/runner/BUCK
rename to tools/testinfra/runner/TARGETS
index c0aa2b272f..226954db01 100644
--- a/tools/testinfra/runner/BUCK
+++ b/tools/testinfra/runner/TARGETS
@@ -7,6 +7,7 @@ rust_binary(
         [
             "anyhow",
             "itertools",
+            "mysql_async",
             "rayon",
             "serde",
             "serde_json",

From dd6c47bfd470a83ec6e12d1a77e1441f92f81f24 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 24 Aug 2021 11:37:25 -0300
Subject: [PATCH 02/10] Apply diffs from cargo-based test-runner

---
 tools/testinfra/runner/src/buck_test.rs |  26 ++-
 tools/testinfra/runner/src/main.rs      | 218 +++++++++++++++++++-----
 tools/testinfra/runner/src/pyunit.rs    |   3 +-
 tools/testinfra/runner/src/rust.rs      |   3 +-
 4 files changed, 203 insertions(+), 47 deletions(-)

diff --git a/tools/testinfra/runner/src/buck_test.rs b/tools/testinfra/runner/src/buck_test.rs
index 59421de8ce..3a70f646b5 100644
--- a/tools/testinfra/runner/src/buck_test.rs
+++ b/tools/testinfra/runner/src/buck_test.rs
@@ -25,8 +25,11 @@ pub struct Test {
     /// The command used to execute the test.
     pub command: Command,
 
-    /// User-facing identifier for this specific test.
-    pub name: String,
+    /// Fully qualified buck test target.
+    pub target: String,
+
+    /// Unit test inside target.
+    pub unit: Option<String>,
 
     /// Labels/tags associated to this test.
     pub labels: HashSet<String>,
@@ -59,7 +62,8 @@ const EXCLUDED_LABELS: &[&str] = &["disabled", "exclude_test_if_transitive_dep"]
 
 #[derive(Debug)]
 pub struct TestResult {
-    pub name: String,
+    pub target: String,
+    pub unit: Option<String>,
     pub attempts: u32,
     pub passed: bool,
     pub duration: Duration,
@@ -68,6 +72,13 @@ pub struct TestResult {
     pub contacts: HashSet<String>,
 }
 
+pub fn test_name(target: &String, unit: &Option<String>) -> String {
+    match unit {
+        None => target.clone(),
+        Some(unit) => target.clone() + "#" + &unit,
+    }
+}
+
 impl Test {
     pub fn run(mut self, retries: u32) -> TestResult {
         let mut attempts = 0;
@@ -90,7 +101,8 @@ impl Test {
                 let mut err = String::new();
                 child.stderr.unwrap().read_to_string(&mut err).unwrap();
                 return TestResult {
-                    name: self.name,
+                    target: self.target,
+                    unit: self.unit,
                     attempts,
                     passed: true,
                     duration,
@@ -105,7 +117,8 @@ impl Test {
                     let mut err = String::new();
                     child.stderr.unwrap().read_to_string(&mut err).unwrap();
                     return TestResult {
-                        name: self.name,
+                        target: self.target,
+                        unit: self.unit,
                         attempts,
                         passed: false,
                         duration,
@@ -134,7 +147,8 @@ pub mod shell {
         );
         let test = Test {
             command,
-            name: spec.target,
+            target: spec.target,
+            unit: None,
             labels: spec.labels,
             contacts: spec.contacts,
             kind: TestKind::Shell,
diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index 267ac22f61..d792361238 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -5,13 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+use std::collections::HashSet;
 use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::{Path, PathBuf};
 use std::process::exit;
+use std::time::Duration;
 
 use anyhow::{Context, Result};
 use itertools::Itertools;
+use postgres::{Client, NoTls};
 use rayon::iter::*;
 use structopt::{clap, StructOpt};
 
@@ -20,7 +23,7 @@ mod buck_test;
 mod pyunit;
 mod rust;
 
-use buck_test::{Test, TestResult};
+use buck_test::{test_name, Test, TestResult};
 
 #[derive(StructOpt, Debug)]
 #[structopt(
@@ -32,23 +35,35 @@ struct Options {
     #[structopt(long = "buck-test-info")]
     spec: PathBuf,
 
-    /// Lists all unit tests and exits without running them
-    #[structopt(long)]
+    /// Lists unit tests and exits without running them
+    #[structopt(long, short)]
     list: bool,
 
     /// Path to generated test report in JUnit XML format
     #[structopt(long = "xml")]
     report: Option<PathBuf>,
 
+    /// Connection string of the DB used in stateful test runs
+    #[structopt(long = "db")]
+    conn: Option<String>,
+
+    /// Commit SHA-1 used to update the test DB on stateful runs
+    #[structopt(long = "commit", requires("conn"))]
+    revision: Option<String>,
+
+    /// Forces auto-disabled tests to run
+    #[structopt(long = "run-disabled")]
+    run_disabled: bool,
+
     /// Maximum number of times a failing unit test will be retried
-    #[structopt(long = "max-retries", default_value = "0")]
+    #[structopt(long = "max-retries", short = "r", default_value = "0")]
     retries: u32,
 
     /// Maximum number of concurrent tests. Passed in by buck test
     #[structopt(long = "jobs", default_value = "1")]
     threads: usize,
 
-    /// Warns on any further options for forward compatibility with buck test
+    /// Warns on any further options for forward compatibility with buck
     #[structopt(hidden = true)]
     ignored: Vec<String>,
 }
@@ -73,45 +88,79 @@ fn main() -> Result<()> {
     // don't run anything when just listing
     if options.list {
         for test in tests {
-            println!("{}", test.name);
+            println!("{}", test_name(&test.target, &test.unit));
         }
         exit(0);
     }
 
+    // connect to DB when it is provided
+    let mut db = match options.conn {
+        None => None,
+        Some(ref uri) => Some(
+            Client::connect(&uri, NoTls)
+                .with_context(|| format!("Couldn't connect to specified test DB at '{}'", uri))?,
+        ),
+    };
+    let disabled = query_disabled(&mut db);
+
     // run tests in parallel (retries share the same thread)
     let total = tests.len();
-    eprintln!("Running {} tests...", total);
+    eprintln!("Found {} tests...", total);
     let _ = rayon::ThreadPoolBuilder::new()
         .num_threads(options.threads)
         .build_global();
     let mut tests: Vec<TestResult> = tests
         .into_par_iter()
         .map(|test| {
-            let test = test.run(options.retries);
+            let run = !disabled.contains(&(test.target.clone(), test.unit.clone()))
+                || options.run_disabled;
+            let test = if run {
+                test.run(options.retries)
+            } else {
+                TestResult {
+                    target: test.target,
+                    unit: test.unit,
+                    attempts: 0,
+                    passed: false,
+                    duration: Duration::ZERO,
+                    stdout: "".to_string(),
+                    stderr: "".to_string(),
+                    contacts: test.contacts,
+                }
+            };
+
+            let name = test_name(&test.target, &test.unit);
             if test.passed {
-                print!("[OK] {} ({} ms)", test.name, test.duration.as_millis());
+                print!("[PASS] {} ({} ms)", name, test.duration.as_millis());
                 if test.attempts > 1 {
                     print!(" ({} attempts needed)\n", test.attempts);
                 } else {
                     print!("\n");
                 }
+            } else if test.attempts == 0 {
+                println!("[SKIP] {}", name);
             } else {
-                println!("[FAIL] {} ({} ms)", test.name, test.duration.as_millis());
+                println!("[FAIL] {} ({} ms)", name, test.duration.as_millis());
             }
+
             return test;
         })
         .collect();
 
     // collect and print results
     let mut passed = 0;
+    let mut skipped = 0;
     let mut errors: Vec<String> = Vec::new();
     for test in tests.iter_mut() {
         if test.passed {
             passed += 1;
+        } else if test.attempts == 0 {
+            skipped += 1;
         } else {
             let mut message = format!(
                 "\nTest {} failed after {} unsuccessful attempts:\n",
-                test.name, test.attempts
+                test_name(&test.target, &test.unit),
+                test.attempts
             );
             for line in test.stderr.split("\n") {
                 let line = format!("    {}\n", line);
@@ -124,26 +173,30 @@ fn main() -> Result<()> {
             errors.push(message);
         }
     }
+    let failed = errors.len();
     for error in errors {
         eprintln!("{}", error);
     }
-    let failed = total - passed;
     println!(
-        "Out of {} tests, {} passed, {} failed",
-        total, passed, failed
+        "Out of {} tests, {} passed, {} failed, {} were skipped",
+        total, passed, failed, skipped
     );
 
-    // generate test report
+    // generate outputs
     match options.report {
-        None => {}
-        Some(path) => report(tests, path)?,
+        None => (),
+        Some(path) => report(&tests, path)?,
+    }
+    match options.revision {
+        None => (),
+        Some(revision) => query_commit(&mut db, revision, &tests)?,
     }
 
     exit(failed as i32);
 }
 
 // Refer to https://llg.cubic.org/docs/junit/
-fn report<P: AsRef<Path>>(tests: Vec<TestResult>, path: P) -> Result<()> {
+fn report<P: AsRef<Path>>(tests: &Vec<TestResult>, path: P) -> Result<()> {
     let path = path.as_ref();
     let file = File::create(&path).with_context(|| {
         format!(
@@ -153,7 +206,10 @@ fn report<P: AsRef<Path>>(tests: Vec<TestResult>, path: P) -> Result<()> {
     })?;
     let mut xml = BufWriter::new(&file);
 
-    let failures = tests.iter().filter(|test| !test.passed).count();
+    let failures = tests
+        .iter()
+        .filter(|test| !test.passed && test.attempts > 0)
+        .count();
     writeln!(xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#)?;
     writeln!(
         xml,
@@ -165,33 +221,31 @@ fn report<P: AsRef<Path>>(tests: Vec<TestResult>, path: P) -> Result<()> {
     // we group unit tests from the same buck target as a JUnit "testsuite"
     let suites = tests
         .into_iter()
-        .map(|test| {
-            let name: Vec<&str> = test.name.split("#").collect();
-            let target = name[0].to_owned();
-            let unit = if name.len() > 1 {
-                name[1].to_owned()
-            } else {
-                target.clone()
-            };
-            return (target, unit, test);
-        })
-        .into_group_map_by(|(target, _, _)| target.to_owned());
+        .into_group_map_by(|test| test.target.clone());
     for (target, cases) in suites {
-        let failures = cases.iter().filter(|(_, _, test)| !test.passed).count();
+        let failures = cases
+            .iter()
+            .filter(|test| !test.passed && test.attempts > 0)
+            .count();
+        let skipped = cases
+            .iter()
+            .filter(|test| !test.passed && test.attempts == 0)
+            .count();
         writeln!(
             xml,
-            r#"  <testsuite name="{}" tests="{}" failures="{}">"#,
+            r#"  <testsuite name="{}" tests="{}" failures="{}" skipped="{}">"#,
             target,
             cases.len(),
-            failures
+            failures,
+            skipped
         )?;
 
-        for (target, unit, test) in cases {
+        for test in cases {
             write!(
                 xml,
                 r#"    <testcase classname="{}" name="{}" time="{}""#,
-                target,
-                unit,
+                &test.target,
+                test.unit.as_ref().unwrap_or(&test.target),
                 test.duration.as_millis() as f32 / 1e3
             )?;
             if test.passed {
@@ -206,12 +260,12 @@ fn report<P: AsRef<Path>>(tests: Vec<TestResult>, path: P) -> Result<()> {
                 writeln!(
                     xml,
                     r#"      <system-out>{}</system-out>"#,
-                    xml_escape_text(test.stdout)
+                    xml_escape_text(&test.stdout)
                 )?;
                 writeln!(
                     xml,
                     r#"      <system-err>{}</system-err>"#,
-                    xml_escape_text(test.stderr)
+                    xml_escape_text(&test.stderr)
                 )?;
                 writeln!(xml, r#"    </testcase>"#)?;
             }
@@ -226,6 +280,92 @@ fn report<P: AsRef<Path>>(tests: Vec<TestResult>, path: P) -> Result<()> {
     return Ok(());
 }
 
-fn xml_escape_text(unescaped: String) -> String {
+fn xml_escape_text(unescaped: &String) -> String {
     return unescaped.replace("<", "&lt;").replace("&", "&amp;");
 }
+
+fn query_disabled(db: &mut Option<Client>) -> HashSet<(String, Option<String>)> {
+    // we have unit test name as NOT NULL in the DB, so empty SQL strings are
+    // converted to Option types in Rust, the same inverse should be done on writes
+    match db {
+        None => HashSet::new(),
+        Some(db) => db
+            .query("SELECT target, test FROM tests WHERE disabled = true", &[])
+            .unwrap()
+            .into_iter()
+            .map(|row| {
+                let target = row.get("target");
+                let test = row.get("test");
+                let test = if test == "" { None } else { Some(test) };
+                return (target, test);
+            })
+            .collect(),
+    }
+}
+
+fn query_commit(db: &mut Option<Client>, revision: String, tests: &Vec<TestResult>) -> Result<()> {
+    match db {
+        None => Ok(()),
+        Some(db) => {
+            let mut transaction = db.transaction()?;
+
+            // we assume PostgreSQL > 9.5 in order to use <ON CONFLICT>
+            let insert_target = transaction.prepare(
+                "INSERT INTO targets (target)
+                VALUES ($1)
+                ON CONFLICT DO NOTHING",
+            )?;
+            let insert_test = transaction.prepare(
+                "INSERT INTO tests (target, test, disabled)
+                VALUES ($1, $2, false)
+                ON CONFLICT DO NOTHING",
+            )?;
+            let insert_result = transaction.prepare(
+                "INSERT INTO results (revision, target, test, passed)
+                VALUES ($1, $2, $3, $4)",
+            )?;
+            let select_last_3 = transaction.prepare(
+                "SELECT test.passed as passed
+                FROM results test, runs run
+                WHERE test.target = $1
+                AND test.test = $2
+                AND run.revision = test.revision
+                ORDER BY run.time DESC
+                LIMIT 3",
+            )?;
+            let update_disabled = transaction.prepare(
+                "UPDATE tests
+                SET disabled = $3
+                WHERE target = $1
+                AND test = $2",
+            )?;
+
+            transaction.execute(
+                "INSERT INTO runs (revision)
+                VALUES ($1)",
+                &[&revision],
+            )?;
+            for test in tests {
+                let target = &test.target;
+                let unit = &test.unit.as_deref().unwrap_or(&"").to_string();
+
+                transaction.execute(&insert_target, &[target])?;
+                transaction.execute(&insert_test, &[target, unit])?;
+                transaction.execute(&insert_result, &[&revision, target, unit, &test.passed])?;
+
+                // auto-disable tests which, after this run, have failed 3 or more times in a row
+                let disabled = transaction
+                    .query(&select_last_3, &[target, unit])?
+                    .into_iter()
+                    .map(|row| row.get("passed"))
+                    .filter(|passed: &bool| !passed)
+                    .count()
+                    >= 3;
+                transaction.execute(&update_disabled, &[target, unit, &disabled])?;
+            }
+
+            transaction.commit()?;
+            Ok(())
+        }
+    }
+}
diff --git a/tools/testinfra/runner/src/pyunit.rs b/tools/testinfra/runner/src/pyunit.rs
index fc107ab677..a6303d64b7 100644
--- a/tools/testinfra/runner/src/pyunit.rs
+++ b/tools/testinfra/runner/src/pyunit.rs
@@ -55,7 +55,8 @@ pub fn list_tests(spec: TestSpec) -> Vec<Test> {
         unit_command.arg(unit);
         tests.push(Test {
             command: unit_command,
-            name: spec.target.clone() + "#" + function,
+            target: spec.target.clone(),
+            unit: Some(function.to_string()),
             labels: spec.labels.clone(),
             contacts: spec.contacts.clone(),
             kind: TestKind::Pyunit,
diff --git a/tools/testinfra/runner/src/rust.rs b/tools/testinfra/runner/src/rust.rs
index 60ede56e03..7523c10c62 100644
--- a/tools/testinfra/runner/src/rust.rs
+++ b/tools/testinfra/runner/src/rust.rs
@@ -62,7 +62,8 @@ pub fn list_tests(spec: TestSpec) -> Vec<Test> {
         unit_command.arg(unit);
         tests.push(Test {
             command: unit_command,
-            name: spec.target.clone() + "#" + unit,
+            target: spec.target.clone(),
+            unit: Some(unit.to_string()),
             labels: spec.labels.clone(),
             contacts: spec.contacts.clone(),
             kind: TestKind::Rust,

From c21dfd84165e80adb5849cb191aa8a354d2ad219 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 24 Aug 2021 11:42:20 -0300
Subject: [PATCH 03/10] Dump SQL table creation script

---
 tools/testinfra/runner/create.sql | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 tools/testinfra/runner/create.sql

diff --git a/tools/testinfra/runner/create.sql b/tools/testinfra/runner/create.sql
new file mode 100644
index 0000000000..a4608e54ac
--- /dev/null
+++ b/tools/testinfra/runner/create.sql
@@ -0,0 +1,30 @@
+BEGIN;
+
+CREATE TABLE runs(
+  revision char(40) NOT NULL PRIMARY KEY,
+  time timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE targets(
+  target varchar(260) NOT NULL PRIMARY KEY CHECK (target <> '')
+);
+
+CREATE TABLE tests(
+  target varchar(260) NOT NULL REFERENCES targets (target) ON DELETE CASCADE,
+  test varchar(260) NOT NULL,
+  disabled boolean NOT NULL DEFAULT false,
+  PRIMARY KEY (target, test)
+);
+
+CREATE INDEX tests_disabled_idx ON tests (disabled);
+
+CREATE TABLE results(
+  revision char(40) NOT NULL REFERENCES runs (revision) ON DELETE CASCADE,
+  target varchar(260) NOT NULL,
+  test varchar(260) NOT NULL,
+  passed boolean NOT NULL,
+  PRIMARY KEY (revision, target, test),
+  FOREIGN KEY (target, test) REFERENCES tests (target, test) ON DELETE CASCADE
+);
+
+COMMIT;

From b96a15576c67ef48b3d1eac83dc1b9f7fdf3c0ff Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 24 Aug 2021 11:45:16 -0300
Subject: [PATCH 04/10] List postgres dependency

---
 tools/testinfra/runner/TARGETS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testinfra/runner/TARGETS b/tools/testinfra/runner/TARGETS
index 226954db01..b294c821e4 100644
--- a/tools/testinfra/runner/TARGETS
+++ b/tools/testinfra/runner/TARGETS
@@ -12,6 +12,7 @@ rust_binary(
             "serde",
             "serde_json",
             "structopt",
+            "postgres",
         ],
         platform = "rust",
     ),

From 316ea56ddf6d56bdee810743eac4c0d2333e3977 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 24 Aug 2021 11:56:19 -0300
Subject: [PATCH 05/10] Fix small details

---
 tools/testinfra/runner/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index d792361238..8aba43d88c 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -52,7 +52,7 @@ struct Options {
     revision: Option<String>,
 
     /// Forces auto-disabled tests to run
-    #[structopt(long = "run-disabled")]
+    #[structopt(long)]
     run_disabled: bool,
 
     /// Maximum number of times a failing unit test will be retried
@@ -286,7 +286,7 @@ fn xml_escape_text(unescaped: &String) -> String {
 
 fn query_disabled(db: &mut Option<Client>) -> HashSet<(String, Option<String>)> {
     // we have unit test name as NOT NULL in the DB, so empty SQL strings are
-    // converted to Option types in Rust, the same inverse should be done on writes
+    // converted to Option types in Rust. the inverse should be done when inserting
     match db {
         None => HashSet::new(),
         Some(db) => db
@@ -309,7 +309,7 @@ fn query_commit(db: &mut Option<Client>, revision: String, tests: &Vec<TestResul
         Some(db) => {
             let mut transaction = db.transaction()?;
 
-            // we assume PostgreSQL > 9.5 in order to use <ON CONFLICT>
+            // we assume PostgreSQL >= 9.5 in order to use <ON CONFLICT>
             let insert_target = transaction.prepare(
                 "INSERT INTO targets (target)
                 VALUES ($1)

From ca2dc0f3d002e04d0b8a1598e9a9aa0afb1db632 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Thu, 26 Aug 2021 22:33:54 -0300
Subject: [PATCH 06/10] Migrate to MySQL

---
 tools/testinfra/runner/src/buck_test.rs |  30 +--
 tools/testinfra/runner/src/main.rs      | 332 +++++++++++++-----------
 tools/testinfra/runner/src/pyunit.rs    |   2 +-
 tools/testinfra/runner/src/rust.rs      |   2 +-
 4 files changed, 203 insertions(+), 163 deletions(-)

diff --git a/tools/testinfra/runner/src/buck_test.rs b/tools/testinfra/runner/src/buck_test.rs
index 3a70f646b5..2cc3baa7e4 100644
--- a/tools/testinfra/runner/src/buck_test.rs
+++ b/tools/testinfra/runner/src/buck_test.rs
@@ -28,8 +28,8 @@ pub struct Test {
     /// Fully qualified buck test target.
     pub target: String,
 
-    /// Unit test inside target.
-    pub unit: Option<String>,
+    /// Test unit, defaults to "main" for singleton test targets.
+    pub unit: String,
 
     /// Labels/tags associated to this test.
     pub labels: HashSet<String>,
@@ -60,25 +60,25 @@ pub enum TestKind {
 /// Labels which mark buck test targets for automatic (and silent) exclusion.
 const EXCLUDED_LABELS: &[&str] = &["disabled", "exclude_test_if_transitive_dep"];
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
+pub enum TestStatus {
+    Pass,
+    Fail,
+    Disabled,
+}
+
+#[derive(Debug, Clone)]
 pub struct TestResult {
     pub target: String,
-    pub unit: Option<String>,
+    pub unit: String,
+    pub status: TestStatus,
     pub attempts: u32,
-    pub passed: bool,
     pub duration: Duration,
     pub stdout: String,
     pub stderr: String,
     pub contacts: HashSet<String>,
 }
 
-pub fn test_name(target: &String, unit: &Option<String>) -> String {
-    match unit {
-        None => target.clone(),
-        Some(unit) => target.clone() + "#" + &unit,
-    }
-}
-
 impl Test {
     pub fn run(mut self, retries: u32) -> TestResult {
         let mut attempts = 0;
@@ -103,8 +103,8 @@ impl Test {
                 return TestResult {
                     target: self.target,
                     unit: self.unit,
+                    status: TestStatus::Pass,
                     attempts,
-                    passed: true,
                     duration,
                     stdout: out,
                     stderr: err,
@@ -119,8 +119,8 @@ impl Test {
                     return TestResult {
                         target: self.target,
                         unit: self.unit,
+                        status: TestStatus::Fail,
                         attempts,
-                        passed: false,
                         duration,
                         stdout: out,
                         stderr: err,
@@ -148,7 +148,7 @@ pub mod shell {
         let test = Test {
             command,
             target: spec.target,
-            unit: None,
+            unit: "main".to_string(),
             labels: spec.labels,
             contacts: spec.contacts,
             kind: TestKind::Shell,
diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index 8aba43d88c..906785130d 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -14,7 +14,8 @@ use std::time::Duration;
 
 use anyhow::{Context, Result};
 use itertools::Itertools;
-use postgres::{Client, NoTls};
+use mysql_async::prelude::*;
+use mysql_async::Conn;
 use rayon::iter::*;
 use structopt::{clap, StructOpt};
 
@@ -23,7 +24,7 @@ mod buck_test;
 mod pyunit;
 mod rust;
 
-use buck_test::{test_name, Test, TestResult};
+use buck_test::{Test, TestResult, TestStatus};
 
 #[derive(StructOpt, Debug)]
 #[structopt(
@@ -43,11 +44,11 @@ struct Options {
     #[structopt(long = "xml")]
     report: Option<PathBuf>,
 
-    /// Connection string of the DB used in stateful test runs
+    /// Connection string of the DB used in stateful test runs. Defaults to read-only
     #[structopt(long = "db")]
     conn: Option<String>,
 
-    /// Commit SHA-1 used to update the test DB on stateful runs
+    /// Revision identifier that enables writing results to the test DB
     #[structopt(long = "commit", requires("conn"))]
     revision: Option<String>,
 
@@ -68,7 +69,8 @@ struct Options {
     ignored: Vec<String>,
 }
 
-fn main() -> Result<()> {
+#[tokio::main]
+async fn main() -> Result<()> {
     // parse command line
     let options = Options::from_args();
     if options.ignored.len() > 0 {
@@ -88,20 +90,20 @@ fn main() -> Result<()> {
     // don't run anything when just listing
     if options.list {
         for test in tests {
-            println!("{}", test_name(&test.target, &test.unit));
+            println!("{}#{}", test.target, test.unit);
         }
         exit(0);
     }
 
-    // connect to DB when it is provided
+    // connect to DB when provided. we handle errors manually to avoid leaking credentials
     let mut db = match options.conn {
         None => None,
-        Some(ref uri) => Some(
-            Client::connect(&uri, NoTls)
-                .with_context(|| format!("Couldn't connect to specified test DB at '{}'", uri))?,
-        ),
+        Some(ref uri) => match Conn::from_url(uri).await {
+            Ok(connection) => Some(connection),
+            Err(_) => panic!("Couldn't connect to specified test DB"),
+        },
     };
-    let disabled = query_disabled(&mut db);
+    let disabled = query_disabled(&mut db).await;
 
     // run tests in parallel (retries share the same thread)
     let total = tests.len();
@@ -109,94 +111,98 @@ fn main() -> Result<()> {
     let _ = rayon::ThreadPoolBuilder::new()
         .num_threads(options.threads)
         .build_global();
-    let mut tests: Vec<TestResult> = tests
+    let tests: Vec<TestResult> = tests
         .into_par_iter()
         .map(|test| {
-            let run = !disabled.contains(&(test.target.clone(), test.unit.clone()))
+            let should_run = !disabled.contains(&(test.target.clone(), test.unit.clone()))
                 || options.run_disabled;
-            let test = if run {
-                test.run(options.retries)
-            } else {
-                TestResult {
+
+            let test = match should_run {
+                true => test.run(options.retries),
+                false => TestResult {
                     target: test.target,
                     unit: test.unit,
+                    status: TestStatus::Disabled,
                     attempts: 0,
-                    passed: false,
                     duration: Duration::ZERO,
                     stdout: "".to_string(),
                     stderr: "".to_string(),
                     contacts: test.contacts,
-                }
+                },
             };
 
-            let name = test_name(&test.target, &test.unit);
-            if test.passed {
-                print!("[PASS] {} ({} ms)", name, test.duration.as_millis());
-                if test.attempts > 1 {
-                    print!(" ({} attempts needed)\n", test.attempts);
-                } else {
-                    print!("\n");
+            let name = format!("{}#{}", test.target, test.unit);
+            match test.status {
+                TestStatus::Pass => {
+                    print!("[OK] {} ({} ms)", name, test.duration.as_millis());
+                    if test.attempts > 1 {
+                        print!(" ({} attempts needed)\n", test.attempts);
+                    } else {
+                        print!("\n");
+                    }
+                }
+                TestStatus::Fail => {
+                    println!("[FAIL] {} ({} ms)", name, test.duration.as_millis());
+                }
+                TestStatus::Disabled => {
+                    println!("[DISABLED] {}", name);
                 }
-            } else if test.attempts == 0 {
-                println!("[SKIP] {}", name);
-            } else {
-                println!("[FAIL] {} ({} ms)", name, test.duration.as_millis());
             }
-
             return test;
         })
         .collect();
 
     // collect and print results
-    let mut passed = 0;
-    let mut skipped = 0;
-    let mut errors: Vec<String> = Vec::new();
-    for test in tests.iter_mut() {
-        if test.passed {
-            passed += 1;
-        } else if test.attempts == 0 {
-            skipped += 1;
-        } else {
-            let mut message = format!(
-                "\nTest {} failed after {} unsuccessful attempts:\n",
-                test_name(&test.target, &test.unit),
-                test.attempts
-            );
-            for line in test.stderr.split("\n") {
-                let line = format!("    {}\n", line);
-                message.push_str(&line);
-            }
-            if test.contacts.len() > 0 {
-                let contacts = format!("Please report this to {:?}\n", test.contacts);
-                message.push_str(&contacts);
+    let (passed, errors, disabled) = tests.iter().fold(
+        (0, Vec::new(), 0),
+        |(passed, mut errors, disabled), test| match test.status {
+            TestStatus::Pass => (passed + 1, errors, disabled),
+            TestStatus::Disabled => (passed, errors, disabled + 1),
+            TestStatus::Fail => {
+                let mut message = format!(
+                    "\nTest {}#{} failed after {} unsuccessful attempts:\n",
+                    test.target, test.unit, test.attempts
+                );
+                for line in test.stderr.split("\n") {
+                    let line = format!("    {}\n", line);
+                    message.push_str(&line);
+                }
+                if test.contacts.len() > 0 {
+                    let contacts = format!("Please report this to {:?}\n", test.contacts);
+                    message.push_str(&contacts);
+                }
+                errors.push(message);
+                (passed, errors, disabled)
             }
-            errors.push(message);
-        }
-    }
+        },
+    );
     let failed = errors.len();
     for error in errors {
         eprintln!("{}", error);
     }
     println!(
-        "Out of {} tests, {} passed, {} failed, {} were skipped",
-        total, passed, failed, skipped
+        "Out of {} tests, {} passed, {} failed, {} are disabled",
+        total, passed, failed, disabled
     );
 
     // generate outputs
-    match options.report {
-        None => (),
-        Some(path) => report(&tests, path)?,
+    if let Some(path) = options.report {
+        report(&tests, path)?;
     }
-    match options.revision {
-        None => (),
-        Some(revision) => query_commit(&mut db, revision, &tests)?,
+    if let Some(revision) = options.revision {
+        commit_test_results(&mut db, revision, &tests).await?;
+    }
+
+    // drop connection and disconnect the pool
+    if let Some(connection) = db {
+        connection.disconnect().await?;
     }
 
     exit(failed as i32);
 }
 
 // Refer to https://llg.cubic.org/docs/junit/
-fn report<P: AsRef<Path>>(tests: &Vec<TestResult>, path: P) -> Result<()> {
+fn report<P: AsRef<Path>>(tests: &[TestResult], path: P) -> Result<()> {
     let path = path.as_ref();
     let file = File::create(&path).with_context(|| {
         format!(
@@ -208,7 +214,10 @@ fn report<P: AsRef<Path>>(tests: &Vec<TestResult>, path: P) -> Result<()> {
 
     let failures = tests
         .iter()
-        .filter(|test| !test.passed && test.attempts > 0)
+        .filter(|test| match test.status {
+            TestStatus::Fail => true,
+            _ => false,
+        })
         .count();
     writeln!(xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#)?;
     writeln!(
@@ -225,12 +234,12 @@ fn report<P: AsRef<Path>>(tests: &Vec<TestResult>, path: P) -> Result<()> {
     for (target, cases) in suites {
         let failures = cases
             .iter()
-            .filter(|test| !test.passed && test.attempts > 0)
-            .count();
-        let skipped = cases
-            .iter()
-            .filter(|test| !test.passed && test.attempts == 0)
+            .filter(|test| match test.status {
+                TestStatus::Fail => true,
+                _ => false,
+            })
             .count();
+        let skipped = cases.iter().filter(|test| test.attempts == 0).count();
         writeln!(
             xml,
             r#"  <testsuite name="{}" tests="{}" failures="{}" skipped="{}">"#,
@@ -245,29 +254,32 @@ fn report<P: AsRef<Path>>(tests: &Vec<TestResult>, path: P) -> Result<()> {
                 xml,
                 r#"    <testcase classname="{}" name="{}" time="{}""#,
                 &test.target,
-                test.unit.as_ref().unwrap_or(&test.target),
+                &test.unit,
                 test.duration.as_millis() as f32 / 1e3
             )?;
-            if test.passed {
-                writeln!(xml, " />")?;
-            } else {
-                writeln!(xml, r#">"#)?;
-                writeln!(
-                    xml,
-                    r#"      <failure>Test failed after {} unsuccessful attempts</failure>"#,
-                    test.attempts
-                )?;
-                writeln!(
-                    xml,
-                    r#"      <system-out>{}</system-out>"#,
-                    xml_escape_text(&test.stdout)
-                )?;
-                writeln!(
-                    xml,
-                    r#"      <system-err>{}</system-err>"#,
-                    xml_escape_text(&test.stderr)
-                )?;
-                writeln!(xml, r#"    </testcase>"#)?;
+            match test.status {
+                TestStatus::Disabled | TestStatus::Pass => {
+                    writeln!(xml, " />")?;
+                }
+                TestStatus::Fail => {
+                    writeln!(xml, r#">"#)?;
+                    writeln!(
+                        xml,
+                        r#"      <failure>Test failed after {} unsuccessful attempts</failure>"#,
+                        test.attempts
+                    )?;
+                    writeln!(
+                        xml,
+                        r#"      <system-out>{}</system-out>"#,
+                        xml_escape_text(&test.stdout)
+                    )?;
+                    writeln!(
+                        xml,
+                        r#"      <system-err>{}</system-err>"#,
+                        xml_escape_text(&test.stderr)
+                    )?;
+                    writeln!(xml, r#"    </testcase>"#)?;
+                }
             }
         }
 
@@ -284,87 +296,115 @@ fn xml_escape_text(unescaped: &String) -> String {
     return unescaped.replace("<", "&lt;").replace("&", "&amp;");
 }
 
-fn query_disabled(db: &mut Option<Client>) -> HashSet<(String, Option<String>)> {
-    // we have unit test name as NOT NULL in the DB, so empty SQL strings are
-    // converted to Option types in Rust. the inverse should be done when inserting
+async fn query_disabled(db: &mut Option<Conn>) -> HashSet<(String, String)> {
     match db {
         None => HashSet::new(),
         Some(db) => db
-            .query("SELECT target, test FROM tests WHERE disabled = true", &[])
+            .query("SELECT target, test FROM tests WHERE disabled = true")
+            .await
             .unwrap()
             .into_iter()
-            .map(|row| {
-                let target = row.get("target");
-                let test = row.get("test");
-                let test = if test == "" { None } else { Some(test) };
-                return (target, test);
-            })
             .collect(),
     }
 }
 
-fn query_commit(db: &mut Option<Client>, revision: String, tests: &Vec<TestResult>) -> Result<()> {
+async fn commit_test_results(
+    db: &mut Option<Conn>,
+    revision: String,
+    tests: &[TestResult],
+) -> Result<()> {
     match db {
         None => Ok(()),
         Some(db) => {
-            let mut transaction = db.transaction()?;
+            // NOTE: INSERT IGNORE and ON DUPLICATE are MySQL-specific ways to upsert
+            let insert_target = "INSERT IGNORE INTO targets (target)
+                VALUES (:target)";
 
-            // we assume PostgreSQL >= 9.5 in order to use <ON CONFLICT>
-            let insert_target = transaction.prepare(
-                "INSERT INTO targets (target)
-                VALUES ($1)
-                ON CONFLICT DO NOTHING",
-            )?;
-            let insert_test = transaction.prepare(
-                "INSERT INTO tests (target, test, disabled)
-                VALUES ($1, $2, false)
-                ON CONFLICT DO NOTHING",
-            )?;
-            let insert_result = transaction.prepare(
-                "INSERT INTO results (revision, target, test, passed)
-                VALUES ($1, $2, $3, $4)",
-            )?;
-            let select_last_3 = transaction.prepare(
-                "SELECT test.passed as passed
+            let insert_test = "INSERT IGNORE INTO tests (target, test, disabled)
+                VALUES (:target, :test, false)";
+
+            let insert_result = "INSERT IGNORE INTO results (revision, target, test, passed)
+                VALUES (:revision, :target, :test, :passed)";
+
+            let select_last_3 = "SELECT test.passed as passed
                 FROM results test, runs run
-                WHERE test.target = $1
-                AND test.test = $2
+                WHERE test.target = :target
+                AND test.test = :test
                 AND run.revision = test.revision
                 ORDER BY run.time DESC
-                LIMIT 3",
-            )?;
-            let update_disabled = transaction.prepare(
-                "UPDATE tests
-                SET disabled = $3
-                WHERE target = $1
-                AND test = $2",
-            )?;
+                LIMIT 3";
 
-            transaction.execute(
+            let update_disabled = "UPDATE tests
+                SET disabled = :disabled
+                WHERE target = :target
+                AND test = :test";
+
+            db.exec_drop(
                 "INSERT INTO runs (revision)
-                VALUES ($1)",
-                &[&revision],
-            )?;
+                VALUES (:revision)
+                ON DUPLICATE KEY UPDATE time = CURRENT_TIMESTAMP",
+                params! {
+                    "revision" => &revision,
+                },
+            )
+            .await?;
             for test in tests {
-                let target = &test.target;
-                let unit = &test.unit.as_deref().unwrap_or(&"").to_string();
-
-                transaction.execute(&insert_target, &[target])?;
-                transaction.execute(&insert_test, &[target, unit])?;
-                transaction.execute(&insert_result, &[&revision, target, unit, &test.passed])?;
+                let passed = match test.status {
+                    TestStatus::Pass => true,
+                    _ => false,
+                };
+
+                db.exec_drop(
+                    insert_target,
+                    params! {
+                        "target" => &test.target,
+                    },
+                )
+                .await?;
+                db.exec_drop(
+                    insert_test,
+                    params! {
+                        "target" => &test.target,
+                        "test" => &test.unit,
+                    },
+                )
+                .await?;
+                db.exec_drop(
+                    insert_result,
+                    params! {
+                        "revision" => &revision,
+                        "target" => &test.target,
+                        "test" => &test.unit,
+                        "passed" => passed,
+                    },
+                )
+                .await?;
 
                 // auto-disable tests which, after this run, have failed 3 or more times in a row
-                let disabled = transaction
-                    .query(&select_last_3, &[target, unit])?
+                let disabled = db
+                    .exec(
+                        select_last_3,
+                        params! {
+                            "target" => &test.target,
+                            "test" => &test.unit
+                        },
+                    )
+                    .await?
                     .into_iter()
-                    .map(|row| row.get("passed"))
                     .filter(|passed: &bool| !passed)
                     .count()
                     >= 3;
-                transaction.execute(&update_disabled, &[target, unit, &disabled])?;
+                db.exec_drop(
+                    update_disabled,
+                    params! {
+                        "target" => &test.target,
+                        "test" => &test.unit,
+                        "disabled" => disabled
+                    },
+                )
+                .await?;
             }
 
-            transaction.commit()?;
             Ok(())
         }
     }
diff --git a/tools/testinfra/runner/src/pyunit.rs b/tools/testinfra/runner/src/pyunit.rs
index a6303d64b7..62596655f6 100644
--- a/tools/testinfra/runner/src/pyunit.rs
+++ b/tools/testinfra/runner/src/pyunit.rs
@@ -56,7 +56,7 @@ pub fn list_tests(spec: TestSpec) -> Vec<Test> {
         tests.push(Test {
             command: unit_command,
             target: spec.target.clone(),
-            unit: Some(function.to_string()),
+            unit: function.to_string(),
             labels: spec.labels.clone(),
             contacts: spec.contacts.clone(),
             kind: TestKind::Pyunit,
diff --git a/tools/testinfra/runner/src/rust.rs b/tools/testinfra/runner/src/rust.rs
index 7523c10c62..4219e4f7cd 100644
--- a/tools/testinfra/runner/src/rust.rs
+++ b/tools/testinfra/runner/src/rust.rs
@@ -63,7 +63,7 @@ pub fn list_tests(spec: TestSpec) -> Vec<Test> {
         tests.push(Test {
             command: unit_command,
             target: spec.target.clone(),
-            unit: Some(unit.to_string()),
+            unit: unit.to_string(),
             labels: spec.labels.clone(),
             contacts: spec.contacts.clone(),
             kind: TestKind::Rust,

From 431cf9baaf4b5ade7f01072350354b72e6b6a9cf Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Fri, 27 Aug 2021 00:46:16 -0300
Subject: [PATCH 07/10] Let BUCK = TARGETS

---
 tools/testinfra/runner/{TARGETS => BUCK} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tools/testinfra/runner/{TARGETS => BUCK} (94%)

diff --git a/tools/testinfra/runner/TARGETS b/tools/testinfra/runner/BUCK
similarity index 94%
rename from tools/testinfra/runner/TARGETS
rename to tools/testinfra/runner/BUCK
index b294c821e4..72c29fec60 100644
--- a/tools/testinfra/runner/TARGETS
+++ b/tools/testinfra/runner/BUCK
@@ -12,7 +12,7 @@ rust_binary(
             "serde",
             "serde_json",
             "structopt",
-            "postgres",
+            "tokio",
         ],
         platform = "rust",
     ),

From 25d025c7951e1c37710f61a12bf32d0ff4b8a5d9 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Fri, 27 Aug 2021 00:47:57 -0300
Subject: [PATCH 08/10] Try to work around the older mysql crate

---
 tools/testinfra/runner/src/main.rs | 42 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index 906785130d..58d6593744 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -326,20 +326,24 @@ async fn commit_test_results(
             let insert_result = "INSERT IGNORE INTO results (revision, target, test, passed)
                 VALUES (:revision, :target, :test, :passed)";
 
-            let select_last_3 = "SELECT test.passed as passed
-                FROM results test, runs run
-                WHERE test.target = :target
-                AND test.test = :test
-                AND run.revision = test.revision
-                ORDER BY run.time DESC
-                LIMIT 3";
+            let count_fail_in_last_3 = "
+                SELECT count(*) AS count
+                FROM (
+                    SELECT test.passed as passed
+                    FROM results test, runs run
+                    WHERE test.target = :target
+                    AND test.test = :test
+                    AND run.revision = test.revision
+                    ORDER BY run.time DESC
+                    LIMIT 3
+                ) WHERE passed = false";
 
             let update_disabled = "UPDATE tests
                 SET disabled = :disabled
                 WHERE target = :target
                 AND test = :test";
 
-            db.exec_drop(
+            db.drop_exec(
                 "INSERT INTO runs (revision)
                 VALUES (:revision)
                 ON DUPLICATE KEY UPDATE time = CURRENT_TIMESTAMP",
@@ -348,20 +352,21 @@ async fn commit_test_results(
                 },
             )
             .await?;
+
             for test in tests {
                 let passed = match test.status {
                     TestStatus::Pass => true,
                     _ => false,
                 };
 
-                db.exec_drop(
+                db.drop_exec(
                     insert_target,
                     params! {
                         "target" => &test.target,
                     },
                 )
                 .await?;
-                db.exec_drop(
+                db.drop_exec(
                     insert_test,
                     params! {
                         "target" => &test.target,
@@ -369,7 +374,7 @@ async fn commit_test_results(
                     },
                 )
                 .await?;
-                db.exec_drop(
+                db.drop_exec(
                     insert_result,
                     params! {
                         "revision" => &revision,
@@ -381,20 +386,17 @@ async fn commit_test_results(
                 .await?;
 
                 // auto-disable tests which, after this run, have failed 3 or more times in a row
-                let disabled = db
-                    .exec(
-                        select_last_3,
+                let (db, disabled) = db
+                    .first_exec(
+                        count_fail_in_last_3,
                         params! {
                             "target" => &test.target,
                             "test" => &test.unit
                         },
                     )
-                    .await?
-                    .into_iter()
-                    .filter(|passed: &bool| !passed)
-                    .count()
-                    >= 3;
-                db.exec_drop(
+                    .await?;
+                let disabled = disabled.unwrap_or(0) >= 3;
+                db.drop_exec(
                     update_disabled,
                     params! {
                         "target" => &test.target,

From 88883f7dabc749231eddf495b5874c91682bc7e4 Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 7 Sep 2021 02:02:10 -0300
Subject: [PATCH 09/10] Better understand the mysql_async API

---
 tools/testinfra/runner/create.sql  |   6 +-
 tools/testinfra/runner/src/main.rs | 153 +++++++++++++++--------------
 2 files changed, 80 insertions(+), 79 deletions(-)

diff --git a/tools/testinfra/runner/create.sql b/tools/testinfra/runner/create.sql
index a4608e54ac..4791285cbb 100644
--- a/tools/testinfra/runner/create.sql
+++ b/tools/testinfra/runner/create.sql
@@ -1,8 +1,8 @@
 BEGIN;
 
 CREATE TABLE runs(
-  revision char(40) NOT NULL PRIMARY KEY,
-  time timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
+  revision varchar(128) NOT NULL PRIMARY KEY,
+  time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE TABLE targets(
@@ -19,7 +19,7 @@ CREATE TABLE tests(
 CREATE INDEX tests_disabled_idx ON tests (disabled);
 
 CREATE TABLE results(
-  revision char(40) NOT NULL REFERENCES runs (revision) ON DELETE CASCADE,
+  revision varchar(128) NOT NULL REFERENCES runs (revision) ON DELETE CASCADE,
   target varchar(260) NOT NULL,
   test varchar(260) NOT NULL,
   passed boolean NOT NULL,
diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index 58d6593744..aaeb205957 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -96,14 +96,14 @@ async fn main() -> Result<()> {
     }
 
     // connect to DB when provided. we handle errors manually to avoid leaking credentials
-    let mut db = match options.conn {
+    let db = match options.conn {
         None => None,
         Some(ref uri) => match Conn::from_url(uri).await {
             Ok(connection) => Some(connection),
             Err(_) => panic!("Couldn't connect to specified test DB"),
         },
     };
-    let disabled = query_disabled(&mut db).await;
+    let (db, disabled) = query_disabled(db).await;
 
     // run tests in parallel (retries share the same thread)
     let total = tests.len();
@@ -190,12 +190,7 @@ async fn main() -> Result<()> {
         report(&tests, path)?;
     }
     if let Some(revision) = options.revision {
-        commit_test_results(&mut db, revision, &tests).await?;
-    }
-
-    // drop connection and disconnect the pool
-    if let Some(connection) = db {
-        connection.disconnect().await?;
+        commit_test_results(db, revision, &tests).await?;
     }
 
     exit(failed as i32);
@@ -296,25 +291,27 @@ fn xml_escape_text(unescaped: &String) -> String {
     return unescaped.replace("<", "&lt;").replace("&", "&amp;");
 }
 
-async fn query_disabled(db: &mut Option<Conn>) -> HashSet<(String, String)> {
+async fn query_disabled(db: Option<Conn>) -> (Option<Conn>, HashSet<(String, String)>) {
     match db {
-        None => HashSet::new(),
-        Some(db) => db
-            .query("SELECT target, test FROM tests WHERE disabled = true")
-            .await
-            .unwrap()
-            .into_iter()
-            .collect(),
+        None => (db, HashSet::new()),
+        Some(db) => {
+            let result = db
+                .prep_exec("SELECT target, test FROM tests WHERE disabled = true", ())
+                .await
+                .unwrap();
+            let (db, disabled) = result.map_and_drop(mysql_async::from_row).await.unwrap();
+            return (Some(db), disabled.into_iter().collect());
+        }
     }
 }
 
 async fn commit_test_results(
-    db: &mut Option<Conn>,
+    db: Option<Conn>,
     revision: String,
     tests: &[TestResult],
-) -> Result<()> {
+) -> Result<Option<Conn>> {
     match db {
-        None => Ok(()),
+        None => Ok(db),
         Some(db) => {
             // NOTE: INSERT IGNORE and ON DUPLICATE are MySQL-specific ways to upsert
             let insert_target = "INSERT IGNORE INTO targets (target)
@@ -326,32 +323,30 @@ async fn commit_test_results(
             let insert_result = "INSERT IGNORE INTO results (revision, target, test, passed)
                 VALUES (:revision, :target, :test, :passed)";
 
-            let count_fail_in_last_3 = "
-                SELECT count(*) AS count
-                FROM (
-                    SELECT test.passed as passed
-                    FROM results test, runs run
-                    WHERE test.target = :target
-                    AND test.test = :test
-                    AND run.revision = test.revision
-                    ORDER BY run.time DESC
-                    LIMIT 3
-                ) WHERE passed = false";
+            let select_last_3 = "
+                SELECT test.passed as passed
+                FROM results test, runs run
+                WHERE test.target = :target
+                AND test.test = :test
+                AND run.revision = test.revision
+                ORDER BY run.time DESC
+                LIMIT 3";
 
             let update_disabled = "UPDATE tests
                 SET disabled = :disabled
                 WHERE target = :target
                 AND test = :test";
 
-            db.drop_exec(
-                "INSERT INTO runs (revision)
+            let mut db = db
+                .drop_exec(
+                    "INSERT INTO runs (revision)
                 VALUES (:revision)
                 ON DUPLICATE KEY UPDATE time = CURRENT_TIMESTAMP",
-                params! {
-                    "revision" => &revision,
-                },
-            )
-            .await?;
+                    params! {
+                        "revision" => &revision,
+                    },
+                )
+                .await?;
 
             for test in tests {
                 let passed = match test.status {
@@ -359,55 +354,61 @@ async fn commit_test_results(
                     _ => false,
                 };
 
-                db.drop_exec(
-                    insert_target,
-                    params! {
-                        "target" => &test.target,
-                    },
-                )
-                .await?;
-                db.drop_exec(
-                    insert_test,
-                    params! {
-                        "target" => &test.target,
-                        "test" => &test.unit,
-                    },
-                )
-                .await?;
-                db.drop_exec(
-                    insert_result,
-                    params! {
-                        "revision" => &revision,
-                        "target" => &test.target,
-                        "test" => &test.unit,
-                        "passed" => passed,
-                    },
-                )
-                .await?;
+                db = db
+                    .drop_exec(
+                        insert_target,
+                        params! {
+                            "target" => &test.target,
+                        },
+                    )
+                    .await?;
+                db = db
+                    .drop_exec(
+                        insert_test,
+                        params! {
+                            "target" => &test.target,
+                            "test" => &test.unit,
+                        },
+                    )
+                    .await?;
+                db = db
+                    .drop_exec(
+                        insert_result,
+                        params! {
+                            "revision" => &revision,
+                            "target" => &test.target,
+                            "test" => &test.unit,
+                            "passed" => passed,
+                        },
+                    )
+                    .await?;
 
                 // auto-disable tests which, after this run, have failed 3 or more times in a row
-                let (db, disabled) = db
-                    .first_exec(
-                        count_fail_in_last_3,
+                let result = db
+                    .prep_exec(
+                        select_last_3,
                         params! {
                             "target" => &test.target,
                             "test" => &test.unit
                         },
                     )
                     .await?;
-                let disabled = disabled.unwrap_or(0) >= 3;
-                db.drop_exec(
-                    update_disabled,
-                    params! {
-                        "target" => &test.target,
-                        "test" => &test.unit,
-                        "disabled" => disabled
-                    },
-                )
-                .await?;
+                let (db_, fails) = result.map_and_drop(mysql_async::from_row).await?;
+                db = db_;
+                let disabled = fails.into_iter().filter(|passed: &bool| !passed).count() >= 3;
+                db = db
+                    .drop_exec(
+                        update_disabled,
+                        params! {
+                            "target" => &test.target,
+                            "test" => &test.unit,
+                            "disabled" => disabled
+                        },
+                    )
+                    .await?;
             }
 
-            Ok(())
+            Ok(Some(db))
         }
     }
 }

From da74499dea142b6575c11ca190b0f5b3be95933a Mon Sep 17 00:00:00 2001
From: "Gabriel B. Sant'Anna" <baiocchi.gabriel@gmail.com>
Date: Tue, 7 Sep 2021 02:56:43 -0300
Subject: [PATCH 10/10] Fix test re-enabling run

---
 tools/testinfra/runner/src/main.rs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/tools/testinfra/runner/src/main.rs b/tools/testinfra/runner/src/main.rs
index aaeb205957..0e4baf620c 100644
--- a/tools/testinfra/runner/src/main.rs
+++ b/tools/testinfra/runner/src/main.rs
@@ -253,9 +253,17 @@ fn report<P: AsRef<Path>>(tests: &[TestResult], path: P) -> Result<()> {
                 test.duration.as_millis() as f32 / 1e3
             )?;
             match test.status {
-                TestStatus::Disabled | TestStatus::Pass => {
+                TestStatus::Pass => {
                     writeln!(xml, " />")?;
                 }
+                TestStatus::Disabled => {
+                    writeln!(xml, r#">"#)?;
+                    writeln!(
+                        xml,
+                        r#"      <skipped message="Automatically disabled by the test runner"/>"#
+                    )?;
+                    writeln!(xml, r#"    </testcase>"#)?;
+                }
                 TestStatus::Fail => {
                     writeln!(xml, r#">"#)?;
                     writeln!(
@@ -320,8 +328,9 @@ async fn commit_test_results(
             let insert_test = "INSERT IGNORE INTO tests (target, test, disabled)
                 VALUES (:target, :test, false)";
 
-            let insert_result = "INSERT IGNORE INTO results (revision, target, test, passed)
-                VALUES (:revision, :target, :test, :passed)";
+            let insert_result = "INSERT INTO results (revision, target, test, passed)
+                VALUES (:revision, :target, :test, :passed)
+                ON DUPLICATE KEY UPDATE passed = :passed";
 
             let select_last_3 = "
                 SELECT test.passed as passed
@@ -340,8 +349,8 @@ async fn commit_test_results(
             let mut db = db
                 .drop_exec(
                     "INSERT INTO runs (revision)
-                VALUES (:revision)
-                ON DUPLICATE KEY UPDATE time = CURRENT_TIMESTAMP",
+                    VALUES (:revision)
+                    ON DUPLICATE KEY UPDATE time = CURRENT_TIMESTAMP",
                     params! {
                         "revision" => &revision,
                     },
@@ -384,7 +393,7 @@ async fn commit_test_results(
                     .await?;
 
                 // auto-disable tests which, after this run, have failed 3 or more times in a row
-                let result = db
+                let results = db
                     .prep_exec(
                         select_last_3,
                         params! {
@@ -393,9 +402,9 @@ async fn commit_test_results(
                         },
                     )
                     .await?;
-                let (db_, fails) = result.map_and_drop(mysql_async::from_row).await?;
+                let (db_, results) = results.map_and_drop(mysql_async::from_row).await?;
                 db = db_;
-                let disabled = fails.into_iter().filter(|passed: &bool| !passed).count() >= 3;
+                let disabled = results.into_iter().filter(|passed: &bool| !passed).count() >= 3;
                 db = db
                     .drop_exec(
                         update_disabled,