mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-16 23:53:17 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

GMS bump (#3992)

Browse Source
This commit is contained in:
Maximilian Hoffman
2022-08-02 13:11:31 -07:00
committed by GitHub
parent 37aa190ab1
commit 701f685ff9
5 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/go.mod
View File

@@ -58,7 +58,7 @@ require (
)
require (
github.com/dolthub/go-mysql-server v0.12.1-0.20220801213125-6a5fb1229fc0
github.com/dolthub/go-mysql-server v0.12.1-0.20220802165934-3c2c00d3f276
github.com/google/flatbuffers v2.0.6+incompatible
github.com/gosuri/uilive v0.0.4
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6

4
go/go.sum
View File

@@ -173,8 +173,8 @@ 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.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-mysql-server v0.12.1-0.20220801213125-6a5fb1229fc0 h1:0HkZlUpIytFYZt3QLccf/tJLFAC2UQiX8qQOi+8aYrE=
github.com/dolthub/go-mysql-server v0.12.1-0.20220801213125-6a5fb1229fc0/go.mod h1:JgB3WpY0RMgyAda3YG5VHVncH2B8i1N9Mx9LOp41lIs=
github.com/dolthub/go-mysql-server v0.12.1-0.20220802165934-3c2c00d3f276 h1:4N8K2GW4qJ55umOhdBodt4tb2CdAManET/rfZ1gkY9w=
github.com/dolthub/go-mysql-server v0.12.1-0.20220802165934-3c2c00d3f276/go.mod h1:JgB3WpY0RMgyAda3YG5VHVncH2B8i1N9Mx9LOp41lIs=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=

45
go/libraries/doltcore/sqle/enginetest/dolt_queries.go
View File

@@ -625,20 +625,24 @@ var HistorySystemTableScriptTests = []queries.ScriptTest{
{
Query: "explain select pk, c from dolt_history_t1 where pk = 3",
Expected: []sql.Row{
{"Projected table access on [pk c]"},
{" └─ Exchange"},
{" └─ Filter(dolt_history_t1.pk = 3)"},
{" └─ IndexedTableAccess(dolt_history_t1 on [dolt_history_t1.pk] with ranges: [{[3, 3]}])"},
{"Exchange"},
{" └─ Filter(dolt_history_t1.pk = 3)"},
{" └─ IndexedTableAccess(dolt_history_t1)"},
{" ├─ index: [dolt_history_t1.pk]"},
{" ├─ filters: [{[3, 3]}]"},
{" └─ columns: [pk c]"},
},
},
{
Query: "explain select pk, c from dolt_history_t1 where pk = 3 and committer = 'someguy'",
Expected: []sql.Row{
{"Project(dolt_history_t1.pk, dolt_history_t1.c)"},
{" └─ Projected table access on [pk c committer]"},
{" └─ Exchange"},
{" └─ Filter((dolt_history_t1.pk = 3) AND (dolt_history_t1.committer = 'someguy'))"},
{" └─ IndexedTableAccess(dolt_history_t1 on [dolt_history_t1.pk] with ranges: [{[3, 3]}])"},
{"Exchange"},
{" └─ Project(dolt_history_t1.pk, dolt_history_t1.c)"},
{" └─ Filter((dolt_history_t1.pk = 3) AND (dolt_history_t1.committer = 'someguy'))"},
{" └─ IndexedTableAccess(dolt_history_t1)"},
{" ├─ index: [dolt_history_t1.pk]"},
{" ├─ filters: [{[3, 3]}]"},
{" └─ columns: [pk c committer]"},
},
},
},
@@ -690,20 +694,25 @@ var HistorySystemTableScriptTests = []queries.ScriptTest{
{
Query: "explain select pk, c from dolt_history_t1 where c = 4",
Expected: []sql.Row{
{"Projected table access on [pk c]"},
{" └─ Exchange"},
{" └─ Filter(dolt_history_t1.c = 4)"},
{" └─ IndexedTableAccess(dolt_history_t1 on [dolt_history_t1.c] with ranges: [{[4, 4]}])"},
{"Exchange"},
{" └─ Filter(dolt_history_t1.c = 4)"},
{" └─ IndexedTableAccess(dolt_history_t1)"},
{" ├─ index: [dolt_history_t1.c]"},
{" ├─ filters: [{[4, 4]}]"},
{" └─ columns: [pk c]"},
},
},
{
Query: "explain select pk, c from dolt_history_t1 where c = 10 and committer = 'someguy'",
Expected: []sql.Row{
{"Project(dolt_history_t1.pk, dolt_history_t1.c)"},
{" └─ Projected table access on [pk c committer]"},
{" └─ Exchange"},
{" └─ Filter((dolt_history_t1.c = 10) AND (dolt_history_t1.committer = 'someguy'))"},
{" └─ IndexedTableAccess(dolt_history_t1 on [dolt_history_t1.c] with ranges: [{[10, 10]}])"}},
{"Exchange"},
{" └─ Project(dolt_history_t1.pk, dolt_history_t1.c)"},
{" └─ Filter((dolt_history_t1.c = 10) AND (dolt_history_t1.committer = 'someguy'))"},
{" └─ IndexedTableAccess(dolt_history_t1)"},
{" ├─ index: [dolt_history_t1.c]"},
{" ├─ filters: [{[10, 10]}]"},
{" └─ columns: [pk c committer]"},
},
},
},
},

20
go/libraries/doltcore/sqle/enginetest/dolt_query_plans.go
View File

@@ -24,35 +24,45 @@ var DoltDiffPlanTests = []queries.QueryPlanTest{
Query: `select * from dolt_diff_one_pk where to_pk=1`,
ExpectedPlan: "Exchange\n" +
" └─ Filter(dolt_diff_one_pk.to_pk = 1)\n" +
" └─ IndexedTableAccess(dolt_diff_one_pk on [dolt_diff_one_pk.to_pk] with ranges: [{[1, 1]}])\n" +
" └─ IndexedTableAccess(dolt_diff_one_pk)\n" +
" ├─ index: [dolt_diff_one_pk.to_pk]\n" +
" └─ filters: [{[1, 1]}]\n" +
"",
},
{
Query: `select * from dolt_diff_one_pk where to_pk>=10 and to_pk<=100`,
ExpectedPlan: "Exchange\n" +
" └─ Filter((dolt_diff_one_pk.to_pk >= 10) AND (dolt_diff_one_pk.to_pk <= 100))\n" +
" └─ IndexedTableAccess(dolt_diff_one_pk on [dolt_diff_one_pk.to_pk] with ranges: [{[10, 100]}])\n" +
" └─ IndexedTableAccess(dolt_diff_one_pk)\n" +
" ├─ index: [dolt_diff_one_pk.to_pk]\n" +
" └─ filters: [{[10, 100]}]\n" +
"",
},
{
Query: `select * from dolt_diff_two_pk where to_pk1=1`,
ExpectedPlan: "Exchange\n" +
" └─ Filter(dolt_diff_two_pk.to_pk1 = 1)\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk on [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2] with ranges: [{[1, 1], [NULL, ∞)}])\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk)\n" +
" ├─ index: [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2]\n" +
" └─ filters: [{[1, 1], [NULL, ∞)}]\n" +
"",
},
{
Query: `select * from dolt_diff_two_pk where to_pk1=1 and to_pk2=2`,
ExpectedPlan: "Exchange\n" +
" └─ Filter((dolt_diff_two_pk.to_pk1 = 1) AND (dolt_diff_two_pk.to_pk2 = 2))\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk on [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2] with ranges: [{[1, 1], [2, 2]}])\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk)\n" +
" ├─ index: [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2]\n" +
" └─ filters: [{[1, 1], [2, 2]}]\n" +
"",
},
{
Query: `select * from dolt_diff_two_pk where to_pk1 < 1 and to_pk2 > 10`,
ExpectedPlan: "Exchange\n" +
" └─ Filter((dolt_diff_two_pk.to_pk1 < 1) AND (dolt_diff_two_pk.to_pk2 > 10))\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk on [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2] with ranges: [{(NULL, 1), (10, ∞)}])\n" +
" └─ IndexedTableAccess(dolt_diff_two_pk)\n" +
" ├─ index: [dolt_diff_two_pk.to_pk1,dolt_diff_two_pk.to_pk2]\n" +
" └─ filters: [{(NULL, 1), (10, ∞)}]\n" +
"",
},
}

9
go/libraries/doltcore/sqle/integration_test/stockmarket_test.go
View File

@@ -20271,10 +20271,11 @@ func TestExplain(t *testing.T) {
expectedExplain := "IndexedJoin(d.Symbol = t.Symbol)\n" +
" ├─ TableAlias(d)\n" +
" │ └─ Projected table access on [type symbol country tradingdate open high low close volume openint]\n" +
" │ └─ Table(daily_summary)\n" +
" │ └─ Table(daily_summary)\n" +
" │ └─ columns: [Type Symbol Country TradingDate Open High Low Close Volume OpenInt]\n" +
" └─ TableAlias(t)\n" +
" └─ Projected table access on [symbol name sector ipoyear]\n" +
" └─ IndexedTableAccess(symbols on [symbols.Symbol])"
" └─ IndexedTableAccess(symbols)\n" +
" ├─ index: [symbols.Symbol]\n" +
" └─ columns: [Symbol Name Sector IPOYear]"
assert.Equal(t, expectedExplain, strings.Join(rowStrings, "\n"))
}