added AntiJoinIncludingNulls join type

Author: angelamayxie

sql/analyzer/indexed_joins.go

@@ -561,7 +561,11 @@ func convertAntiToLeftJoin(m *memo.Memo) error {
 		rightGrp := m.MemoizeProject(nil, anti.Right, projectExpressions)
 
 		// join is a new group
-		joinGrp := m.MemoizeLeftJoin(nil, anti.Left, rightGrp, plan.JoinTypeLeftOuterExcludeNulls, anti.Filter)
+		joinType := plan.JoinTypeLeftOuter
+		if anti.Op.IsExcludeNulls() {
+			joinType = plan.JoinTypeLeftOuterExcludeNulls
+		}
+		joinGrp := m.MemoizeLeftJoin(nil, anti.Left, rightGrp, joinType, anti.Filter)
 
 		// drop null projected columns on right table
 		nullFilters := make([]sql.Expression, len(nullify))

sql/analyzer/unnest_exists_subqueries.go

@@ -190,7 +190,7 @@ func unnestExistSubqueries(ctx *sql.Context, scope *plan.Scope, a *Analyzer, fil
 			switch joinType {
 			case plan.JoinTypeAnti:
 				cond := expression.NewLiteral(true, types.Boolean)
-				ret = plan.NewAntiJoin(ret, s.inner, cond).WithComment(comment)
+				ret = plan.NewAntiJoinIncludingNulls(ret, s.inner, cond).WithComment(comment)
 				qFlags.Set(sql.QFlagInnerJoin)
 			case plan.JoinTypeSemi:
 				ret = plan.NewCrossJoin(ret, s.inner).WithComment(comment)
@@ -209,7 +209,7 @@ func unnestExistSubqueries(ctx *sql.Context, scope *plan.Scope, a *Analyzer, fil
 
 		switch joinType {
 		case plan.JoinTypeAnti:
-			ret = plan.NewAntiJoin(ret, s.inner, expression.JoinAnd(outerFilters...)).WithComment(comment)
+			ret = plan.NewAntiJoinIncludingNulls(ret, s.inner, expression.JoinAnd(outerFilters...)).WithComment(comment)
 			qFlags.Set(sql.QFlagInnerJoin)
 		case plan.JoinTypeSemi:
 			ret = plan.NewSemiJoin(ret, s.inner, expression.JoinAnd(outerFilters...)).WithComment(comment)

sql/memo/join_order_builder.go

@@ -811,7 +811,7 @@ func (j *joinOrderBuilder) constructJoin(
 		rel = &LeftJoin{b}
 	case plan.JoinTypeSemi:
 		rel = &SemiJoin{b}
-	case plan.JoinTypeAnti:
+	case plan.JoinTypeAnti, plan.JoinTypeAntiIncludeNulls:
 		rel = &AntiJoin{b}
 	case plan.JoinTypeLateralInner, plan.JoinTypeLateralCross,
 		plan.JoinTypeLateralRight, plan.JoinTypeLateralLeft:
@@ -1428,7 +1428,7 @@ func getOpIdx(e *edge) int {
 		return 1
 	case plan.JoinTypeSemi:
 		return 2
-	case plan.JoinTypeAnti:
+	case plan.JoinTypeAnti, plan.JoinTypeAntiIncludeNulls:
 		return 3
 	case plan.JoinTypeLeftOuter:
 		return 4

sql/plan/join.go

@@ -33,6 +33,7 @@ const (
 	JoinTypeInner                                     // InnerJoin
 	JoinTypeSemi                                      // SemiJoin
 	JoinTypeAnti                                      // AntiJoin
+	JoinTypeAntiIncludeNulls                          // AntiJoinIncludingNulls
 	JoinTypeLeftOuter                                 // LeftOuterJoin
 	JoinTypeLeftOuterExcludeNulls                     // LeftOuterJoinExcludingNulls
 	JoinTypeFullOuter                                 // FullOuterJoin
@@ -49,10 +50,13 @@ const (
 	JoinTypeLeftOuterRangeHeap                        // LeftOuterRangeHeapJoin
 	JoinTypeSemiHash                                  // SemiHashJoin
 	JoinTypeAntiHash                                  // AntiHashJoin
+	JoinTypeAntiHashIncludeNulls                      // AntiHashJoinIncludeNulls
 	JoinTypeSemiLookup                                // SemiLookupJoin
 	JoinTypeAntiLookup                                // AntiLookupJoin
+	JoinTypeAntiLookupIncludeNulls                    // AntiLookupIncludeNulls
 	JoinTypeSemiMerge                                 // SemiMergeJoin
 	JoinTypeAntiMerge                                 // AntiMergeJoin
+	JoinTypeAntiMergeIncludeNulls                     // AntiMergeIncludeNulls
 	JoinTypeUsing                                     // NaturalJoin
 	JoinTypeUsingLeft                                 // NaturalLeftJoin
 	JoinTypeUsingRight                                // NaturalRightJoin
@@ -98,7 +102,10 @@ func (i JoinType) IsPhysical() bool {
 		JoinTypeSemiLookup, JoinTypeSemiMerge, JoinTypeSemiHash,
 		JoinTypeHash, JoinTypeLeftOuterHash, JoinTypeLeftOuterHashExcludeNulls,
 		JoinTypeMerge, JoinTypeLeftOuterMerge,
-		JoinTypeAntiLookup, JoinTypeAntiMerge, JoinTypeAntiHash, JoinTypeRangeHeap, JoinTypeLeftOuterRangeHeap:
+		JoinTypeAntiLookup, JoinTypeAntiLookupIncludeNulls,
+		JoinTypeAntiMerge, JoinTypeAntiMergeIncludeNulls,
+		JoinTypeAntiHash, JoinTypeAntiHashIncludeNulls,
+		JoinTypeRangeHeap, JoinTypeLeftOuterRangeHeap:
 		return true
 	default:
 		return false
@@ -129,7 +136,7 @@ func (i JoinType) IsDegenerate() bool {
 
 func (i JoinType) IsMerge() bool {
 	switch i {
-	case JoinTypeMerge, JoinTypeSemiMerge, JoinTypeAntiMerge, JoinTypeLeftOuterMerge:
+	case JoinTypeMerge, JoinTypeSemiMerge, JoinTypeAntiMerge, JoinTypeAntiMergeIncludeNulls, JoinTypeLeftOuterMerge:
 		return true
 	default:
 		return false
@@ -138,7 +145,8 @@ func (i JoinType) IsMerge() bool {
 
 func (i JoinType) IsHash() bool {
 	switch i {
-	case JoinTypeHash, JoinTypeSemiHash, JoinTypeAntiHash, JoinTypeLeftOuterHash, JoinTypeLeftOuterHashExcludeNulls, JoinTypeCrossHash:
+	case JoinTypeHash, JoinTypeSemiHash, JoinTypeAntiHash, JoinTypeAntiHashIncludeNulls,
+		JoinTypeLeftOuterHash, JoinTypeLeftOuterHashExcludeNulls, JoinTypeCrossHash:
 		return true
 	default:
 		return false
@@ -157,20 +165,23 @@ func (i JoinType) IsSemi() bool {
 
 func (i JoinType) IsAnti() bool {
 	switch i {
-	case JoinTypeAnti, JoinTypeAntiLookup, JoinTypeAntiMerge, JoinTypeAntiHash:
+	case JoinTypeAnti, JoinTypeAntiIncludeNulls, JoinTypeAntiLookup, JoinTypeAntiLookupIncludeNulls,
+		JoinTypeAntiMerge, JoinTypeAntiMergeIncludeNulls, JoinTypeAntiHash, JoinTypeAntiHashIncludeNulls:
 		return true
 	default:
 		return false
 	}
 }
 
 func (i JoinType) IsPartial() bool {
-	return i == JoinTypeSemi ||
-		i == JoinTypeAnti ||
-		i == JoinTypeSemiHash ||
-		i == JoinTypeAntiHash ||
-		i == JoinTypeAntiLookup ||
-		i == JoinTypeSemiLookup
+	switch i {
+	case JoinTypeSemi, JoinTypeAnti, JoinTypeAntiIncludeNulls, JoinTypeSemiHash,
+		JoinTypeAntiHash, JoinTypeAntiHashIncludeNulls, JoinTypeAntiLookup, JoinTypeAntiLookupIncludeNulls,
+		JoinTypeSemiLookup:
+		return true
+	default:
+		return false
+	}
 }
 
 func (i JoinType) IsPlaceholder() bool {
@@ -180,7 +191,8 @@ func (i JoinType) IsPlaceholder() bool {
 
 func (i JoinType) IsLookup() bool {
 	switch i {
-	case JoinTypeLookup, JoinTypeLeftOuterLookup, JoinTypeAntiLookup, JoinTypeSemiLookup:
+	case JoinTypeLookup, JoinTypeLeftOuterLookup,
+		JoinTypeAntiLookup, JoinTypeAntiLookupIncludeNulls, JoinTypeSemiLookup:
 		return true
 	default:
 		return false
@@ -221,6 +233,8 @@ func (i JoinType) AsHash() JoinType {
 		return JoinTypeSemiHash
 	case JoinTypeAnti:
 		return JoinTypeAntiHash
+	case JoinTypeAntiIncludeNulls:
+		return JoinTypeAntiHashIncludeNulls
 	case JoinTypeCross:
 		return JoinTypeCrossHash
 	default:
@@ -249,6 +263,8 @@ func (i JoinType) AsMerge() JoinType {
 		return JoinTypeSemiMerge
 	case JoinTypeAnti:
 		return JoinTypeAntiMerge
+	case JoinTypeAntiIncludeNulls:
+		return JoinTypeAntiMergeIncludeNulls
 	default:
 		return i
 	}
@@ -264,6 +280,8 @@ func (i JoinType) AsLookup() JoinType {
 		return JoinTypeSemiLookup
 	case JoinTypeAnti:
 		return JoinTypeAntiLookup
+	case JoinTypeAntiIncludeNulls:
+		return JoinTypeAntiLookupIncludeNulls
 	default:
 		return i
 	}
@@ -521,8 +539,8 @@ func NewLookupJoin(left, right sql.Node, cond sql.Expression) *JoinNode {
 	return NewJoin(left, right, JoinTypeLookup, cond)
 }
 
-func NewAntiJoin(left, right sql.Node, cond sql.Expression) *JoinNode {
-	return NewJoin(left, right, JoinTypeAnti, cond)
+func NewAntiJoinIncludingNulls(left, right sql.Node, cond sql.Expression) *JoinNode {
+	return NewJoin(left, right, JoinTypeAntiIncludeNulls, cond)
 }
 
 func NewSemiJoin(left, right sql.Node, cond sql.Expression) *JoinNode {