From 1cfcfd15ae7df523a16f65b6611c0006da383fe7 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Mon, 1 Mar 2021 11:06:50 -0800 Subject: [PATCH] Upgraded go-mysql-server and unskipped many tests that now pass --- go/go.mod | 2 +- go/go.sum | 24 ++----------------- .../sqle/enginetest/dolt_engine_test.go | 13 ---------- .../doltcore/sqle/enginetest/dolt_harness.go | 14 ++--------- 4 files changed, 5 insertions(+), 48 deletions(-) diff --git a/go/go.mod b/go/go.mod index 2ba4c976d33..b44d9236f7e 100644 --- a/go/go.mod +++ b/go/go.mod @@ -18,7 +18,7 @@ require ( github.com/denisbrodbeck/machineid v1.0.1 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078 github.com/dolthub/fslock v0.0.2 - github.com/dolthub/go-mysql-server v0.8.1-0.20210225042400-5b877de2ee49 + github.com/dolthub/go-mysql-server v0.8.1-0.20210301185422-c8a395d5b370 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c diff --git a/go/go.sum b/go/go.sum index 0db5f2634d5..eda6b71fa4d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -148,34 +148,14 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dolthub/fslock v0.0.2 h1:8vUh47iKovgrtXNrXVIzsIoWLlspoXg+3nslhUzgKSw= github.com/dolthub/fslock v0.0.2/go.mod h1:0i7bsNkK+XHwFL3dIsSWeXSV7sykVzzVr6+jq8oeEo0= -github.com/dolthub/go-mysql-server v0.8.1-0.20210204225036-6f1f6f38ba9b h1:5S5nV4sE4xMTvLbSZda99Mj5qQMgviePr50/imSkpOw= -github.com/dolthub/go-mysql-server v0.8.1-0.20210204225036-6f1f6f38ba9b/go.mod h1:MRKd4z13XtaT7yLEx2GtR1IIt3WHXVqkzNvYD7WXt3o= -github.com/dolthub/go-mysql-server v0.8.1-0.20210208003100-dd56f3c1ce22 h1:r9wSSC4GKnTrjJ+j6mKmLi6w7ITTXtAM6dnBq62m1xo= -github.com/dolthub/go-mysql-server v0.8.1-0.20210208003100-dd56f3c1ce22/go.mod h1:MRKd4z13XtaT7yLEx2GtR1IIt3WHXVqkzNvYD7WXt3o= -github.com/dolthub/go-mysql-server v0.8.1-0.20210208182140-6662781802de h1:WwXxR7IgDlb+dvwhMkmupRSFEPTKKiNkvZArKeUue/0= -github.com/dolthub/go-mysql-server v0.8.1-0.20210208182140-6662781802de/go.mod h1:MRKd4z13XtaT7yLEx2GtR1IIt3WHXVqkzNvYD7WXt3o= -github.com/dolthub/go-mysql-server v0.8.1-0.20210217224011-a1c0481adc7f h1:eB8UbHr/JP5SrSMRFNia+OOvbFZd1Qfp7g0gb70tUek= -github.com/dolthub/go-mysql-server v0.8.1-0.20210217224011-a1c0481adc7f/go.mod h1:nBKzGdaoziyZv/vDlqfYHeJVjuGpr8ufCu4IeJ1dSx0= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218211211-cccb3d54ab1e h1:dmpKix6s/jw+q4pYy+8j6RV4w3tC1Pm08pSbW9nX/L8= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218211211-cccb3d54ab1e/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218212021-6d9e6c123308 h1:labPBNBmLYLIIch/iLWH30iCzvEWzY6ZDStQHFExZGs= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218212021-6d9e6c123308/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218214641-69329baa1b64 h1:+gaXPwx2F41ucUa5+ZNq4kxDrx7dA/1Qtmj59qCYMHo= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218214641-69329baa1b64/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218215427-a54f0fc72e64 h1:Zjh6LEeIpj/dMeLT0R1XvTaAESPVmpu0kPgsrywS4SE= -github.com/dolthub/go-mysql-server v0.8.1-0.20210218215427-a54f0fc72e64/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= -github.com/dolthub/go-mysql-server v0.8.1-0.20210225042400-5b877de2ee49 h1:Gi/zSb1YPliJBvXTM/GHQZGp/eb7emqgUW/CSHEAwrM= -github.com/dolthub/go-mysql-server v0.8.1-0.20210225042400-5b877de2ee49/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= +github.com/dolthub/go-mysql-server v0.8.1-0.20210301185422-c8a395d5b370 h1:C7hkb/Ui4ayhhsHcuABtQv4GOw5purjnG7kQBHgr2Ew= +github.com/dolthub/go-mysql-server v0.8.1-0.20210301185422-c8a395d5b370/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg= github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 h1:0ol5pj+QlKUKAtqs1LiPM3ZJKs+rHPgLSsMXmhTrCAM= github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms= github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxPmiuOTndT+lUWUeGjx6eoNOK9O4tQQQ= github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66/go.mod h1:N5ZIbMGuDUpTpOFQ7HcsN6WSIpTGQjHP+Mz27AfmAgk= github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c h1:ZIo6IOXU3/rJK4lp83QRq1zGhQrjQQtlmE2b7H1Vv/k= github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY= -github.com/dolthub/vitess v0.0.0-20201204232015-9e3805156304 h1:+rrZ04a6UHIIopSMmAK5/qO+hWGoIwmRY6qzlDaUIIk= -github.com/dolthub/vitess v0.0.0-20201204232015-9e3805156304/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM= -github.com/dolthub/vitess v0.0.0-20210217181323-2e12516a549a h1:zPh/GxVnpSJnw+fU801C6az6csVgABDNwBea6m4dDgw= -github.com/dolthub/vitess v0.0.0-20210217181323-2e12516a549a/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM= github.com/dolthub/vitess v0.0.0-20210218042642-d99ce5b7b004 h1:q0eAoMtzoMShK2tzCYSISEfoIgOWtIOaNvlnC+lFQCE= github.com/dolthub/vitess v0.0.0-20210218042642-d99ce5b7b004/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index dc9559f0271..489ce1c62a6 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -29,19 +29,6 @@ func init() { sqle.MinRowsPerPartition = 2 } -func limitTestQueriesTo(queries ...string) { - querySet := set.NewStrSet(queries) - - var broken []enginetest.QueryTest - for _, t := range enginetest.QueryTests { - if querySet.Contains(t.Query) { - broken = append(broken, t) - } - } - - enginetest.QueryTests = broken -} - func TestQueries(t *testing.T) { enginetest.TestQueries(t, newDoltHarness(t)) } diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go index e6e0afcc724..ec9a4c02da4 100755 --- a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go @@ -66,19 +66,9 @@ func (d *DoltHarness) WithParallelism(parallelism int) *DoltHarness { func (d *DoltHarness) SkipQueryTest(query string) bool { lowerQuery := strings.ToLower(query) return strings.Contains(lowerQuery, "typestable") || // we don't support all the required types - strings.Contains(lowerQuery, "show full columns") || // we set extra comment info lowerQuery == "show variables" || // we set extra variables - strings.Contains(lowerQuery, "show create table") || // we set extra comment info - strings.Contains(lowerQuery, "show indexes from") || // we create / expose extra indexes (for foreign keys) - strings.Contains(lowerQuery, "row_number") || // TODO: fix row number race - query == `SELECT i FROM mytable mt - WHERE (SELECT i FROM mytable where i = mt.i and i > 2) IS NOT NULL - AND (SELECT i2 FROM othertable where i2 = i) IS NOT NULL - ORDER BY i` || // broken for unknown reasons - query == `SELECT i FROM mytable mt - WHERE (SELECT i FROM mytable where i = mt.i and i > 1) IS NOT NULL - AND (SELECT i2 FROM othertable where i2 = i and i < 3) IS NOT NULL - ORDER BY i` // broken for unknown reasons + strings.Contains(lowerQuery, "show create table fk_tbl") || // we create an extra key for the FK that vanilla gms does not + strings.Contains(lowerQuery, "show indexes from") // we create / expose extra indexes (for foreign keys) } func (d *DoltHarness) Parallelism() int {