-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
30048: opt: fix join cardinality calculation r=RaduBerinde a=RaduBerinde The calculation was incorrect because it accounted for the "outerness" using `AtLeast` but only with the `Min` value; the `Max` value needs to be taken into account as well. This change fixes this and makes the following improvements: - `AtLeast` now takes a cardinality instead of a value; - `AtMost` is renamed to `Limit` because it's inconsistent with the new `AtLeast`; - the cardinality for full outer join with a false filter is improved; - extensive unit tests for makeJoinCardinality. Release note: None Co-authored-by: Radu Berinde <[email protected]>
- Loading branch information
Showing
5 changed files
with
318 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| // Copyright 2018 The Cockroach Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| // implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package memo | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/sql/opt" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/opt/props" | ||
| ) | ||
|
|
||
| func TestJoinCardinality(t *testing.T) { | ||
| c := func(min, max uint32) props.Cardinality { | ||
| return props.Cardinality{Min: min, Max: max} | ||
| } | ||
|
|
||
| type testCase struct { | ||
| left props.Cardinality | ||
| right props.Cardinality | ||
| expected props.Cardinality | ||
| } | ||
|
|
||
| testCaseGroups := []struct { | ||
| joinType opt.Operator | ||
| filter string // "true", "false", or "other" | ||
| testCases []testCase | ||
| }{ | ||
| { // Inner join, true filter. | ||
| joinType: opt.InnerJoinOp, | ||
| filter: "true", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(25, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Inner join, false filter. | ||
| joinType: opt.InnerJoinOp, | ||
| filter: "false", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 0)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 0)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 0)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(0, 0)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Inner join, other filter. | ||
| joinType: opt.InnerJoinOp, | ||
| filter: "other", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(0, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Left join, true filter. | ||
| joinType: opt.LeftJoinOp, | ||
| filter: "true", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(25, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Left join, false filter. | ||
| joinType: opt.LeftJoinOp, | ||
| filter: "false", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 10)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 10)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 10)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(5, 10)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Left join, other filter. | ||
| joinType: opt.LeftJoinOp, | ||
| filter: "other", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Right join, true filter. | ||
| joinType: opt.RightJoinOp, | ||
| filter: "true", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(25, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Right join, false filter. | ||
| joinType: opt.RightJoinOp, | ||
| filter: "false", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 10)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 10)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 10)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(5, 10)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Right join, other filter. | ||
| joinType: opt.RightJoinOp, | ||
| filter: "other", | ||
| testCases: []testCase{ | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Full join, true filter. | ||
| joinType: opt.FullJoinOp, | ||
| filter: "true", | ||
| testCases: []testCase{ | ||
| {left: c(0, 1), right: c(0, 1), expected: c(0, 2)}, | ||
| {left: c(1, 1), right: c(1, 1), expected: c(1, 2)}, | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(25, 100)}, | ||
| {left: c(7, 10), right: c(8, 10), expected: c(56, 100)}, | ||
| {left: c(8, 10), right: c(7, 10), expected: c(56, 100)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Full join, false filter. | ||
| joinType: opt.FullJoinOp, | ||
| filter: "false", | ||
| testCases: []testCase{ | ||
| {left: c(0, 1), right: c(0, 1), expected: c(0, 2)}, | ||
| {left: c(1, 1), right: c(1, 1), expected: c(2, 2)}, | ||
| {left: c(2, 5), right: c(3, 8), expected: c(5, 13)}, | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 20)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 20)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 20)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(10, 20)}, | ||
| {left: c(7, 10), right: c(8, 10), expected: c(15, 20)}, | ||
| {left: c(8, 10), right: c(7, 10), expected: c(15, 20)}, | ||
| }, | ||
| }, | ||
|
|
||
| { // Full join, other filter. | ||
| joinType: opt.FullJoinOp, | ||
| filter: "other", | ||
| testCases: []testCase{ | ||
| {left: c(0, 1), right: c(0, 1), expected: c(0, 2)}, | ||
| {left: c(1, 1), right: c(1, 1), expected: c(1, 2)}, | ||
| {left: c(2, 5), right: c(3, 8), expected: c(3, 40)}, | ||
| {left: c(0, 10), right: c(0, 10), expected: c(0, 100)}, | ||
| {left: c(5, 10), right: c(0, 10), expected: c(5, 100)}, | ||
| {left: c(0, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| {left: c(5, 10), right: c(5, 10), expected: c(5, 100)}, | ||
| {left: c(7, 10), right: c(8, 10), expected: c(8, 100)}, | ||
| {left: c(8, 10), right: c(7, 10), expected: c(8, 100)}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, group := range testCaseGroups { | ||
| t.Run(fmt.Sprintf("%s/%s", group.joinType, group.filter), func(t *testing.T) { | ||
| for i, tc := range group.testCases { | ||
| t.Run(fmt.Sprintf("%d", i), func(t *testing.T) { | ||
| b := &logicalPropsBuilder{} | ||
| h := &joinPropsHelper{} | ||
| h.rightCardinality = tc.right | ||
| h.joinType = group.joinType | ||
| h.filterIsTrue = (group.filter == "true") | ||
| h.filterIsFalse = (group.filter == "false") | ||
|
|
||
| res := b.makeJoinCardinality(tc.left, h) | ||
| if res != tc.expected { | ||
| t.Errorf( | ||
| "left=%s right=%s: expected %s, got %s\n", tc.left, tc.right, tc.expected, res, | ||
| ) | ||
| } | ||
| }) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.