Skip to content

sql/parse: generate sort before project. #44

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
smola merged 1 commit into from
Nov 4, 2016
Merged

sql/parse: generate sort before project. #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@ func TestEngine_Query(t *testing.T) {
sql.NewMemoryRow(int64(1)),
},
)

testQuery(t, e,
"SELECT i FROM mytable WHERE s = 'a' ORDER BY i DESC;",
[]sql.Row{
sql.NewMemoryRow(int64(1)),
},
)

testQuery(t, e,
"SELECT i FROM mytable WHERE s = 'a' ORDER BY i DESC LIMIT 1;",
[]sql.Row{
sql.NewMemoryRow(int64(1)),
},
)
}

func testQuery(t *testing.T, e *gitql.Engine, q string, r []sql.Row) {
Expand Down Expand Up @@ -66,10 +80,13 @@ func testQuery(t *testing.T, e *gitql.Engine, q string, r []sql.Row) {
func newEngine(t *testing.T) *gitql.Engine {
assert := require.New(t)

table := mem.NewTable("mytable", sql.Schema{{"i", sql.BigInteger}})
assert.Nil(table.Insert(int64(1)))
assert.Nil(table.Insert(int64(2)))
assert.Nil(table.Insert(int64(3)))
table := mem.NewTable("mytable", sql.Schema{
{"i", sql.BigInteger},
{"s", sql.String},
})
assert.Nil(table.Insert(int64(1), "a"))
assert.Nil(table.Insert(int64(2), "b"))
assert.Nil(table.Insert(int64(3), "c"))

db := mem.NewDatabase("mydb")
db.AddTable("mytable", table)
Expand Down
3 changes: 2 additions & 1 deletion sql/parse/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ func (p *parser) buildPlan() (sql.Node, error) {
node = plan.NewFilter(p.filterClauses[0], node)
}

node = plan.NewProject(p.projection, node)
if len(p.sortFields) > 0 {
node = plan.NewSort(p.sortFields, node)
}
Expand All @@ -291,6 +290,8 @@ func (p *parser) buildPlan() (sql.Node, error) {
node = plan.NewLimit(int64(*p.limit), node)
}

node = plan.NewProject(p.projection, node)

return node, nil
}

Expand Down
70 changes: 35 additions & 35 deletions sql/parse/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,31 @@ var fixtures = map[string]sql.Node{
plan.NewUnresolvedRelation("foo"),
),
),
`SELECT foo, bar FROM foo LIMIT 10;`: plan.NewLimit(int64(10),
plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
`SELECT foo, bar FROM foo LIMIT 10;`: plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
plan.NewLimit(int64(10),
plan.NewUnresolvedRelation("foo"),
),
),
`SELECT foo, bar FROM foo ORDER BY baz DESC;`: plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
`SELECT foo, bar FROM foo ORDER BY baz DESC;`: plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewUnresolvedRelation("foo"),
),
),
`SELECT foo, bar FROM foo WHERE foo = bar LIMIT 10;`: plan.NewLimit(int64(10),
plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
`SELECT foo, bar FROM foo WHERE foo = bar LIMIT 10;`: plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
plan.NewLimit(int64(10),
plan.NewFilter(
expression.NewEquals(
expression.NewUnresolvedColumn("foo"),
Expand All @@ -79,26 +79,26 @@ var fixtures = map[string]sql.Node{
),
),
),
`SELECT foo, bar FROM foo ORDER BY baz DESC LIMIT 1;`: plan.NewLimit(int64(1),
plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
`SELECT foo, bar FROM foo ORDER BY baz DESC LIMIT 1;`: plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
plan.NewLimit(int64(1),
plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewUnresolvedRelation("foo"),
),
),
),
`SELECT foo, bar FROM foo WHERE qux = 1 ORDER BY baz DESC LIMIT 1;`: plan.NewLimit(int64(1),
plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
`SELECT foo, bar FROM foo WHERE qux = 1 ORDER BY baz DESC LIMIT 1;`: plan.NewProject(
[]sql.Expression{
expression.NewUnresolvedColumn("foo"),
expression.NewUnresolvedColumn("bar"),
},
plan.NewLimit(int64(1),
plan.NewSort(
[]plan.SortField{{expression.NewUnresolvedColumn("baz"), plan.Descending}},
plan.NewFilter(
expression.NewEquals(
expression.NewUnresolvedColumn("qux"),
Expand Down